Regenerated language files.

13 files changed, 32180 insertions, 39875 deletions

diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po
index 22a46da0a..67c068f08 100644
--- a/language/anope.ca_ES.po
+++ b/language/anope.ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:12-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Catalan\n"
@@ -15,11 +15,68 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s per més informació."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s Changed the DEFCON level to %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s afegit a la llista d'accés de %s amb nivel %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s afegit a la llista de kicks automàtics en el canal %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s afegida a  la llista de paraules malsonants de  %s."
+
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s afegit a la llista de AKILLs."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s afegit a la llista de SNLINEs."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s afegit a la llista de SQLINEs."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s afegit a la llista de SZLINEs."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s afegit a la teva lllista d'accés."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s afegit a la teva lllista d'accés."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s afegit a la teva lllista d'accés."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s afegit a la teva lllista d'accés."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -35,15 +92,16 @@ msgstr ""
 "per més informació sobre una comanda especifica\n"
 "escriu /msg %s HELP comanda."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s et permet crear un bot en el teu propi canal.\n"
 "Això ha estat creat per a usuaris que no poden\n"
@@ -54,8 +112,8 @@ msgstr ""
 "informació sobre un comanda especifica, escriu  \n"
 "/msg %s HELP comanda."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -75,124 +133,56 @@ msgstr ""
 "escriu /msg %s HELP comanda.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s és una utilitat que permet a usuaris de IRC\n"
-"enviar missatges curts a altres usuaris de IRC, estiguin\n"
-"en linea o no, o a canals(*). Ambdós el nickname que\n"
-"envia i el nickname o canal destinataris han d'estar\n"
-"registrats per a enviar un memo.\n"
-"\n"
-"Les comandes de %s incloen:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s Changed the DEFCON level to %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s afegit a la llista d'accés de %s amb nivel %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s afegit a la llista de kicks automàtics en el canal %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s afegida a  la llista de paraules malsonants de  %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s afegit a la llista de AKILLs."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s afegit a la llista de SNLINEs."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s afegit a la llista de SQLINEs."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s afegit a la llista de SZLINEs."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s afegit a la teva lllista d'accés."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s afegit a la teva lllista d'accés."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ja existeix a la llista de paraules malsonants de %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ja esta present a la llista de kick automàtic en el canal %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ja esta present a la llista de AKILLs."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ja existeix a la llista de SNLINEs."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ja existeix a la llista de SQLINEs."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ja existeix a la llista de SZLINEs."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s no pot ser pres com vegades a banegar"
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s changed your usermodes."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -206,43 +196,43 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s esborrat de la llista AOP de %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s esborrat de la llista d'accés de %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s esborrat de la llista de kicks automàtics del canal %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s esborrada de la llista de paraules malsonants de %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s instàncies esborrades de la llista d'excepcions al límit de sessions."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s esborrat de la llista de AKILLs."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s esborrat de la llista de SNLINEs."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s esborrat de la llista de SQLINEs."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s esborrat de la llista de SZLINEs."
@@ -252,71 +242,80 @@ msgstr "%s esborrat de la llista de SZLINEs."
 msgid "%s deleted from your access list."
 msgstr "%s esborrat de la teva lllista d'accés."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s esborrat de la teva lllista d'accés."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s esborrat de la teva lllista d'accés."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s inhabilitat(s) en el canal %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s te masses canals registrats."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s és una utilitat que permet a usuaris de IRC\n"
+"enviar missatges curts a altres usuaris de IRC, estiguin\n"
+"en linea o no, o a canals(*). Ambdós el nickname que\n"
+"envia i el nickname o canal destinataris han d'estar\n"
+"registrats per a enviar un memo.\n"
+"\n"
+"Les comandes de %s incloen:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ja esta cobert per %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s afegit a la teva lllista d'accés."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s no es un tipus de ban valid."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s no és un bot valid o un canal registrat."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s no es un e-mail valid."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "El nick %s no esta en el canal %s actualment."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s not found on ignore list."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -327,12 +326,12 @@ msgstr "%s moved to %s AOP list."
 msgid "%s not found on %s %s list."
 msgstr "%s no trobat a la llista AOP de %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no trobat a la llista d'accés de %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s no trobat a la llista de kicks automàtics en el canal %s."
@@ -342,32 +341,32 @@ msgstr "%s no trobat a la llista de kicks automàtics en el canal %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s no trobada a la llista de paraules malsonants de %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s no trobat a la llista de sessió."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s no trobat a a la llista d'excepcions al límit de sessions."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s no trobat a la llista de AKILLs."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s no trobat a a la llista de SNLINEs."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s no trobat a la llista de SQLINEs"
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s no trobat a la llista de SZLINEs."
@@ -377,12 +376,17 @@ msgstr "%s no trobat a la llista de SZLINEs."
 msgid "%s not found on your access list."
 msgstr "%s no trobat a la teva lllista d'accés."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s no trobat a la teva lllista d'accés."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s esborrat de la teva lllista d'accés."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -406,17 +410,12 @@ msgstr "%s will now be ignored for %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Noticia: Totes les comandes enviades a %s son monitorejades!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Noticia: Els serveis estan en mode read-only; Els canvis no seran guardats!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -424,11 +423,12 @@ msgstr ""
 "Recordatori: Les mascares AKILL no poden contenir nicks; asegura't de no "
 "incloure el nick en la teva mascara."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Recordatori: Sols pots afegir mascares IP a la llista de SZLINEs."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -480,22 +480,22 @@ msgstr "[auto-memo] The memo you sent has been viewed."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER clau email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER clau email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP grup clau"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -512,7 +512,7 @@ msgstr ""
 "o un altre acció maliciosa. L'abus de %s resultara, com a\n"
 "mínim, en la perdua del nickname esmentat."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -533,7 +533,8 @@ msgstr ""
 "Veure l'accés, AKICK, i paràmetres de les llistes de nivells per a\n"
 "qualsevol canal."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -545,1008 +546,343 @@ msgstr ""
 "veure la llista d'accés per qualsevol nickname\n"
 "(/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opcions : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "            \tvhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick del bot : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick del bot : Encara no assignat."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "              Opciós: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "  Kicker per majuscules : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "  Kicker per majuscules : %s (%d kick(s) per a ban; mínim %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "            Caps kicker : %s (mínim %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "          Fundador: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Tipus de ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "    Kicker per negretes : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker per negretes : %s (%d kick(s) per a ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kicker per flood : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kicker per flood : %s (%d kick(s) per a ban; %d linees en %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kicker per flood : %s (%d linees en %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mascara : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "     Kicker per colors : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker per colors : %s (%d kick(s) per a ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "       Tipus de ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "  Últim cop utilitzat: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      Mode de lock: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "  Kicker per repetició : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "  Kicker per repetició : %s (%d kick(s) per a ban; %d vegades)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "  Kicker per repetició : %s (%d vegades)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Successor: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "  Kicker per majuscules : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "    Kicker per negretes : %s (%d kick(s) per a ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "         Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "         Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Últim tòpic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "        Registrat: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (inhabilitat)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (nomès el fundador)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Modifica la llista d'adreçes autoritzades"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Modifica la llista d'usuaris privilegiats"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Manté la llista d'AutoKick"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Manté la llista d'AutoKick"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Manipula la llista AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Modifica la llista d'usuaris AOP"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Assigna un bot a un canal"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Manté una llista de paraules malsonants"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr ""
-"    BANTYPE       Estableix com els serveis posen bans\n"
-"                  en el canal"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Manté la llista de bots de la xarxa"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Llista bots disponibles"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Cancela l'últim memo enviat"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL all users on a specific channel"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Llista tots els records de canal"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Checks if last memo to a nick was read"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "    Creat : %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulate the DefCon system"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Delete the vhost of another user"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Esborra un o més memos"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Delete the vhost for all nicks in a group"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Estableix la descripció del canal"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Estableix el display del teu grup amb serveis"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Cancel.la l'enregistrament d'un canal"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Cancela el registre d'un nickname"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "       Descripció: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Associa un E-mail amb el teu nickname"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Modifica la llista de límit de sessió"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Evita que un canal es faci servir"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Impossibilita que un nickname sigui utilitzat"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Estableix el fundador d'un canal"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Recupera la clau per un nickname\n"
-"               (sols si encriptació esta deshabilitada)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Envia un missatge a totss els usuaris"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Associa un salutació amb el teu nickname"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Syncs the vhost for all nicks in a group"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Ingresa en un grup"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr " Missatge de benvinguda: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Oculta algunes parts de la teva informació"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Per identificar-te amb la teva clau"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Displays information about your memos"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Jupiter\" (Mart,Saturn....) un servidor"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Rete el topic quant el canal no\n"
-"                  esta en uso"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Configura kickers"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kickeja un usuari d'un canal"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Activa o desactiva la protecció"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Estableix el llenguatge amb el que els serveis\n"
-"                   t'enviaran missatges"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Redefine el significat de nivells d'accés"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Displays one or more vhost entries."
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   llista els teus memos"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Defineix missatges per a ser mostrats a usuaris\n"
-"                al conectarse"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Canvia els Modes d'un canal"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  neteja els Modes d'un canal"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Info about a loaded module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     List loaded modules"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Un-Load a module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr ""
-"    MSG        canvia el metode de comunicació amb els\n"
-"                    serveis"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Temporalment elimina totes les linees O:\n"
-"                d'un servidor remotamente"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deactivates your assigned vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Give Operflags to a certain user"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Activates your assigned vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    Defineix missatges per a ser mostrats a usuaris\n"
-"                al transformar-se en operadors"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Envia una noticia quant les comandes\n"
-"                  OP/DEOP son utilitzats"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "    Opcions : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Estableix la clau del teu nickname"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Regula l'ús de comandes critiques"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Oculta el canal de la comanda LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr ""
-"    QUIT        Termina el programa de serveis sense guardar\n"
-"                els canvis"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Defineix missatges per a ser mostrats a usuaris\n"
-"                al conectarse"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Llegeix un o més memos"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr ""
-"    RECOVER    Kickeja un usuari que estigui utilitzant el teu nickname"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Registra un nickname"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Registra un nickname"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE    Repren possesió del teu nick després de RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Recarrega la configuració dels serveis"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr ""
-"    RESTART     Guarda la base de dades dels serveis i\n"
-"                reinicia els serveis"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Restringeix l'accés al canal"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Sends a memo and requests a read receipt"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Kicker per inversos : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker per inversos : %s (%d kick(s) per a ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Activa les opcions de seguretat de %s"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr ""
-"    SECUREFOUNDER Estricto control de l'estatus de fundador\n"
-"                  del canal"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Estricte control de l'estatus de chanop"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Envia un memo a un nick o canal"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Send a memo to all registered users"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Vas oblidar la teva clau? Intenta això"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Mostra la llista de sessions de host"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Configura opcions de bots"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Set the vhost of another user"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Estableix varies opcions globals dels serveis"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Establir opcions i informació d'un canal"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Estableix proteccions, inclouent kills"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Estableix opcions relacionades a memos"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Set the vhost for all nicks in a group"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr ""
-"    SHUTDOWN    Termina el programa de serveis guardant els\n"
-"                canvios"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Firma kicks fets amb la comanda KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Manipula la llista SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Modifica la llista d'usuaris SOP"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Manipula la llista SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Display Services staff and online status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF  Send a memo to all opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       mostra estatus dels serveis i la xarxa"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Returns the current access level of a user\n"
-"               on a channel"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Estableix el successor d'un canal"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forcefully change a user's nickname"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Manipula la llista SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr ""
-"    TOPICLOCK     El topic sols pot ser canviat amb\n"
-"                  TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Change a user's modes"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Releases a suspended channel"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Força a la base de dades dels serveis a\n"
-"                ser actualitzada a disc inmediatament"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Llista tots els records d'usuaris"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Utilitzat a : %d canal(s)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Canvia el sistema de privilegis d'usuari"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kicker per paraules malsonants : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kicker per paraules malsonants : %s (%d kick(s) per a ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "      \t\tAdreça E-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "   Esta en linea desde: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Ultima vegada vist: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Tòpic establert per: %s"
@@ -1556,20 +892,6 @@ msgstr " Tòpic establert per: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1580,26 +902,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1609,99 +922,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Nom real : %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "     Temps registrat: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Kicker per subrallats : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Kicker per subratllats : %s (%d kick(s) per a ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Num  De                Data/Hora"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Jupiter\" (Mart,Saturn....) un servidor"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (per %s en %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (per %s en %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1720,17 +1016,12 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "%s commands:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s no es notificat per memos nous."
@@ -1740,34 +1031,34 @@ msgstr "%s no es notificat per memos nous."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (per %s en %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modules loaded."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots disponibles."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknames en el grup."
@@ -1778,14 +1069,14 @@ msgstr "%d nicknames en el grup."
 msgid "%s %s list is empty."
 msgstr "La llista AOP de %s esta buida."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "La llista d'accés de %s esta buida."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La llista de kicks automàtics del canal %s esta buida."
@@ -1795,7 +1086,7 @@ msgstr "La llista de kicks automàtics del canal %s esta buida."
 msgid "%s bad words list is empty."
 msgstr "La llista de paraules malsonants de %s esta buida."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s no pot ser el sucessor en el canal %s ja que n'es el fundador."
@@ -1805,48 +1096,47 @@ msgstr "%s no pot ser el sucessor en el canal %s ja que n'es el fundador."
 msgid "%s cannot receive memos."
 msgstr "%s no pot rebre memos."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "%s commands:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr ""
-"%s La cobertura es mes amplia; Per favor utilitzi una mascara mes especifica."
+msgid "%s commands:"
+msgstr "%s commands:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s actualment te %d memos, dels quals %d encara no han estat llegits."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s actualment te %d memos, dels quals 1 encara no ha estat llegit."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s actualment te %d memos."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s actualment te %d memos, dels quals cap ha estat llegit."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s actualment te 1 memo i encara no ha estat llegit."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s te 1 memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s no te memos."
@@ -1856,47 +1146,27 @@ msgstr "%s no te memos."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s actualment te molts memos i no pot rebre'n mes."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s no te límit per a memos."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s no te memos."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s no te memos nous."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s es %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s esta momentaneament offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s Esta actualment online."
@@ -1918,23 +1188,23 @@ msgstr "%s is enable"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s no es notificat per memos nous."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s es notificat per memos nous quant es connecta i quant li són enviats."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s es notificat de nous memos quant es connecta."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s es notificat quant nous memos li són enviats."
@@ -1953,6 +1223,11 @@ msgstr ""
 "Llista AOP per a %s:\n"
 "  Num  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1994,63 +1269,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) afegit a la llista de bots."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "El límit de memos per a %s es %d, i no pot ser canviat."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "El límit de memos per a %s es %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<desconegut>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
@@ -2063,38 +1341,29 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "A vhost ident must be in the format of a valid ident"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nivell] | llista]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT canal text"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
@@ -2108,17 +1377,22 @@ msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-mascara] [rao]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE en %s completa; %d usuaris afectats."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL all users on a specific channel"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "La llista de AKILLS esta buida."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2127,43 +1401,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "accés denegat."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nivell d'accés per a %s en %s cambiada a %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nivell d'accés per a %s en %s no cambiada de %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "El nivell d'accés ha de ser entre %d i %d inclosos."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "El nivell de accés no pot ser zero."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opcions del nivell d'accés pel canal %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Nivells d'accés per a %s canviats als valors originals."
@@ -2178,20 +1443,11 @@ msgstr "Access list for %s is empty."
 msgid "Access list for %s:"
 msgstr "Lllista d'accés per %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Llista d'accés per a %s:\n"
-"  Num   Niv  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lllista d'accés:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2200,6 +1456,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Activa les opcions de seguretat de %s"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Activates your assigned vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2220,7 +1486,7 @@ msgstr "Nueva noticia de oper anadida (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Nova noticia a l'atzar afegida (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2233,22 +1499,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
@@ -2257,12 +1523,12 @@ msgstr "All vhost's in the group %s have been set to %s"
 msgid "All logon news items deleted."
 msgstr "Totes les notícies d'entrada esborrades."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Tots els teus memos han estat esborrats."
 
@@ -2274,22 +1540,22 @@ msgstr "Totes les notícies de oper esborrades."
 msgid "All random news items deleted."
 msgstr "Totes les notícies al azar esborrades."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Tots els usuaris han estat kickegats del canal %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
@@ -2413,12 +1679,34 @@ msgstr "Abilitat a utilizar comandes de fantasia"
 msgid "Allowed to view the access list"
 msgstr "Abilitat a veure la lllista de accés"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Assigna un bot a un canal"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Associa un salutació amb el teu nickname"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Associa un E-mail amb el teu nickname"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Llista de kicks automàtics pel canal %s:"
@@ -2443,17 +1731,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Mode automàtico +v"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [paraula | llista] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2472,26 +1760,26 @@ msgstr ""
 "llista de paraules malsonants per a %s:\n"
 "  Num   Paraula                        Tipo"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "La llista de paraules malsonants esta ara buida."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipus de ban pel canal %s es ara #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "El bot %s ja existeix."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "El bot %s no existeix."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "El bot %s ha estat assignat al canal %s."
@@ -2506,27 +1794,27 @@ msgstr "El bot %s ha estat canviat a %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "El bot %s ha estat esborrat."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot kickejara ops en el canal %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot kickejara voices en el canal %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot no kickejara ops en el canal %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot no kickejara voices en el canal %s."
@@ -2556,16 +1844,11 @@ msgstr "Bot Idents may only contain valid characters."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "El bot no esta al canal %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Llista de bots:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2574,7 +1857,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2585,7 +1868,7 @@ msgstr ""
 "%d kicks al mateix usuari. Utilitza la comanda BADWORDS\n"
 "per a afegir o treure paraules."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2593,7 +1876,7 @@ msgstr ""
 "El bot ara kickejara paraules malsonants. Utilitza la comanda BADWORDS\n"
 "per a afegir o treure paraules."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2602,11 +1885,11 @@ msgstr ""
 "El bot ara kickjeara negretes, i banejara després de \n"
 "%d kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "El bot ara kickjeara negretes."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2617,7 +1900,7 @@ msgstr ""
 "%d caràcters i %d%% del missatge senser), i banegara\n"
 "després de %d kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2626,7 +1909,7 @@ msgstr ""
 "El bot ara kickejara majuscules (han de ser al menys\n"
 "%d caràcters i %d%% del missatge senser)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2635,11 +1918,11 @@ msgstr ""
 "El bot ara kickejara colors, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "El bot ara kickejara colors."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2648,12 +1931,12 @@ msgstr ""
 "El bot ara kickejara flood (%d linees in %d segons), i \n"
 "banejara després de %d kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "El bot ara kickejara flood (%d linees en %d segons)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2662,11 +1945,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2677,7 +1960,7 @@ msgstr ""
 "el mateix), i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2686,7 +1969,7 @@ msgstr ""
 "El bot ara kickejara repeticions (usuaris que repeteixin %d vegades\n"
 "el mateix)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2695,11 +1978,11 @@ msgstr ""
 "El bot ara kickejara reversos, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "El bot ara kickejara reversos."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2708,16 +1991,16 @@ msgstr ""
 "El bot ara kickejara subratllats, i banejara després de %d \n"
 "kicks al mateix usuari."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "El bot ara kickejara subratllats."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "El bot ara kickejara colors."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2726,182 +2009,209 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "El bot ja no kickejara paraules malsonants. "
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "El bot ja no kickejara negretes."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "El bot ja no kickejara majuscules."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "El bot ja no kickejara colors."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "El bot ja no kickejara flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "El bot ja no kickejara repeticions."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "El bot ja no kickejara reversos."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "El bot ja no kickejara subratllats."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "El bot ja no kickejara majuscules."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ      : %6d registres, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservats a operadors de IRC:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes llegits   : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escrits : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR canal Modes-a-netegar"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Cancela l'últim memo enviat"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Cancel.la l'enregistrament d'un canal"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Cancela el registre d'un nickname"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar email ara; per favor intenta en uns instants."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Llista de bots:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Access list for %s is empty."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Lllista d'accés per %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ     : %6d registres, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Changed usermodes of %s."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s changed your usermodes."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "El Canal %s No existeix."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr ""
+"    MSG        canvia el metode de comunicació amb els\n"
+"                    serveis"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Changed usermodes of %s."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "El canal %s ha estat eliminat."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"El Canal %s ha estat prohibit per %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "El canal %s ja esta enregistrat!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s ara prohibit."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "El Canal %s no esta registrat."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "El Canal %s no pot ser registrat o usat."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "El canal %s no pot ser enregistrat."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "El canal %s esta registrat sota el teu nickname: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canal        : %6d registres, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "El canal %s caducara."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "El canal %s no caducara."
@@ -2911,33 +2221,28 @@ msgstr "El canal %s no caducara."
 msgid "Channel %s %s list has been cleared."
 msgstr "La llista AOP de canals %s ha estat netegada."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La llista d'accés pel canal %s ha estat netegada."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La llista de kicks automàtics en canal %s ha estat netegada."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Channel %s is now released."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal no estan soportades pel teu IRCd, així que no les pots "
 "utilitzar."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2945,7 +2250,7 @@ msgstr ""
 "Llista de canal:\n"
 "Nom                 Modes de Usr. Tòpic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2954,7 +2259,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2962,16 +2267,47 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Checks if last memo to a nick was read"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Configura opcions de bots"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Configura kickers"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  neteja els Modes d'un canal"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Llista actual de AKILLs:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2979,15 +2315,15 @@ msgstr ""
 "Llista actual de AKILLs:\n"
 "  Num   Mascara                           Raó"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Llista actual de SNLINEs:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2995,11 +2331,11 @@ msgstr ""
 "Llista actual de SNLINEs:\n"
 "  Num   Mascara                           Raó"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Llista actual de SQLINEs:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3007,11 +2343,11 @@ msgstr ""
 "Llista actual de SQLINEs:\n"
 "  Num   Mascara                           Raó"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Llista actual de SZLINEs:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3020,7 +2356,7 @@ msgstr ""
 "  Num   Mascara                           Raó"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "llista d'excepcions al límit de sessions actual:"
 
@@ -3044,56 +2380,61 @@ msgstr "Numero actual de SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero actual de SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Actuals usuaris: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {numero | llista | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP canal"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deactivates your assigned vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3218,6 +2559,47 @@ msgstr "Temps d'expiració per defecte de SZLINE: 1 minut"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Temps d'expiració per defecte de SZLINE: Sense expiració"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Defineix missatges per a ser mostrats a usuaris\n"
+"                al conectarse"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Defineix missatges per a ser mostrats a usuaris\n"
+"                al conectarse"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    Defineix missatges per a ser mostrats a usuaris\n"
+"                al transformar-se en operadors"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Esborra un o més memos"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Delete the vhost for all nicks in a group"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Delete the vhost of another user"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3228,7 +2610,7 @@ msgstr "%d instàncies esborrades de la llista AOP de %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d instàncies esborrades de la llista d'accés de %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr ""
@@ -3270,7 +2652,7 @@ msgstr "%d instàncies esborrades de la llista de SZLINEs."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 instància esborrada de la llista d'accés de %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 instància esborrada de la llista de kicks automàtics del canal %s."
@@ -3305,32 +2687,74 @@ msgstr "1 instància esborrada de la llista de SZLINEs."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 instància esborrada de la llista AOP de %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descripció de %s canviada a%s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "Desactivada"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Display Services staff and online status"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Displays one or more vhost entries."
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3359,169 +2783,210 @@ msgstr "No utilitzis la paraula %s en aquest canal!"
 msgid "Don't use underlines on this channel!"
 msgstr "No utilitzis subratllats en aquest canal!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail per %s es invalid."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametres]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "Activada"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "End of %s list."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "fi de llista d'accés."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Fi de la llista de canals."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Fi de la llista d'usuaris."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Catala"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Recarrega la configuració dels serveis"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Excepció per a %s (#%d) moguda a la posició %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Temps d'expiració per a %s canviat."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID canal raó"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [raó]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname rao"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [rao]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "Mode fantasia ara activada en el canal %s."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "Mode fantasia ara activada en el canal %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s will no longer be ignored."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "La mascara %s ja esta present a la teva lllista d'accés."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Força a la base de dades dels serveis a\n"
+"                ser actualitzada a disc inmediatament"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forcefully change a user's nickname"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Vas oblidar la teva clau? Intenta això"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "El Fundador de %s cambiat a %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "La comanda GETPASS no esta disponible per l'us d'encriptació."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [clau]"
 
@@ -3529,11 +2994,26 @@ msgstr "GHOST nickname [clau]"
 msgid "GLOBAL message"
 msgstr "GLOBAL missatge"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "El ghost amb el teu nick ha estat expulsat."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Give Operflags to a certain user"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Salutació"
 
@@ -3541,78 +3021,156 @@ msgstr "Salutació"
 msgid "Greet message displayed"
 msgstr "Missatge de benvinguda mostrat"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Mode salutació ara activat en el canal %s."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Mode salutació ara activat en el canal %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Oculta algunes parts de la teva informació"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Oculta el canal de la comanda LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d registres, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts amb un mínim de %d sessions:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY clau"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Per identificar-te amb la teva clau"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si no canvies el teu nick en 20 segons, el canviare jo."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si no canvies el teu nick en un minut, el canviare jo."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
@@ -3621,12 +3179,13 @@ msgstr "Ignore list has been cleared."
 msgid "Ignore list is empty."
 msgstr "La llista ignore esta buida."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Llista de bots:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3642,25 +3201,17 @@ msgstr ""
 "Escriu /msg %s HELP SET opció per mes\n"
 "informació sobre una opció especifica."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Info about a loaded module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informació pel bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informació pel canal %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Temps d'expiració invàlid."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3668,13 +3219,11 @@ msgstr ""
 "Mascara invalida. Nomès mascares reals son valides ja que excepcions no son "
 "comparades a nicks o usernames."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Invalid passcode has been entered, please check the e-mail again, and retry."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3683,7 +3232,7 @@ msgstr ""
 "Límit de sessió invàlid. Ha de ser un sencer vàlido més gran o igual a zero "
 "i mes petit que %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Valor de umbral invàlid. Ha de ser un sencer vàlid més gran a 1."
 
@@ -3691,12 +3240,17 @@ msgstr "Valor de umbral invàlid. Ha de ser un sencer vàlid més gran a 1."
 msgid "JUPE servername [reason]"
 msgstr "JUPE nom-del-servidor [raó]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Ingresa en un grup"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opció {ON|OFF} [establiments]"
@@ -3705,262 +3259,446 @@ msgstr "KICK canal opció {ON|OFF} [establiments]"
 msgid "KICK channel user reason"
 msgstr "KICK canal usuari raó"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kickeja un usuari d'un canal"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr ""
+"    RECOVER    Kickeja un usuari que estigui utilitzant el teu nickname"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nivell]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST patro"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST patro [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [llista | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP grup clau"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [text|numero]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Llenguatge canviat a Català."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ultim memo enviat a %s va ser cancel.lat."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ùltim missatge quit: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ultima adreça vista: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nivell per a %s en el canal %s cambiat a %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivell ha d'estar entre %d i %d inclosos."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Aquesta comanda es inservible en aquest mode."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lllista de resultats concordant %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     List loaded modules"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lllista de nicknames en el grup de %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lllista de nicknames en el teu grup:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   llista els teus memos"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Llista tots els records de canal"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lllista de nicknames en el teu grup:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Llista tots els records d'usuaris"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Llista bots disponibles"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Canals locals no poden ser enregistrats."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Notícia d'entrada #%d esborrada."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Notícia d'entrada #%d no trobada!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Notícies d'entrada:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE canal Modes"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Manté la llista d'AutoKick"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Manté una llista de paraules malsonants"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Manté la llista de bots de la xarxa"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Manté la llista d'AutoKick"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Manipula la llista AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulate the DefCon system"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Manipula la llista SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Manipula la llista SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Manipula la llista SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La mascara %s ja esta present a la teva lllista d'accés."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "La mascara ha de ser de la forma usuari@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Matches and returns all users that registered using given "
+"email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Màxim  numero d'usuaris: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d de %s (%s). per a esborrar-lo escriu: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d de %s (%s). per a esborrar-lo escriu: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d ha estat esborrat."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Límit de memos per a %s deshabilitat."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Límite de memos per a %s establert a %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Límit de memos per a %s establert a 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Límit de memos molt alt; limitant-lo a %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviat a %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ numero"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ %s numero"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ numero"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memos per a %s. per a llegir-los escriu: /msg %s READ %s numero"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Mode de missatge"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "      Mode de lock: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Modifica la llista d'usuaris AOP"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Modifica la llista d'usuaris SOP"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Modifica la llista d'adreçes autoritzades"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Modifica la llista d'usuaris privilegiats"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Modifica la llista de límit de sessió"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS   : %6d registres, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grups NS    : %6d registres, %5d kB"
@@ -3973,11 +3711,13 @@ msgstr "Mai expulsat pels kicks del bot"
 msgid "New memo"
 msgstr "New memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Nous memos per a %s. per a llegir-los escriu: /msg %s READ numero"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Nous memos per a %s. Per a llegir-los escriu: /msg %s READ %s numero"
 
@@ -3985,141 +3725,107 @@ msgstr "Nous memos per a %s. Per a llegir-los escriu: /msg %s READ %s numero
 msgid "News list is full!"
 msgstr "La llista de notícies esta plena!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"El nick %s ha estat prohibit per %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Nickname %s ha estat expulsat."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "El nickname %s ja esta registrat!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "El nick %s esta prohibit."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "El nick %s no esta sent utilitzat."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "El nick %s no esta en us."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "El nick %s no esta registrat."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "El nick %s no pot ser registrat o utilitzat."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s ha estat desconnectat."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is currently suspended."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NOT registered, please try again later."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nickname %s confirmed"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nickname %s ha estat expulsat."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "El nickname %s ja esta registrat!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "El nickname %s no pot ser registrat."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "El nickname %s ja esta registrat sota el teu compte: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nickname Registration (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4130,26 +3836,36 @@ msgstr ""
 "automatica, en altres paraules, seran esborrats després\n"
 "de %d dies."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Mode no bot ara activat en el canal %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Mode no bot ara activat en el canal %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Sense bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "no expira"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "No existeix ajuda per %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
@@ -4164,13 +3880,13 @@ msgid "No matching entries on %s %s list."
 msgstr "No existeixen instàncies coincidents a la llista AOP de %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "No hi ha instàncies que concordin a la llista d'accés de %s ."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
@@ -4185,41 +3901,45 @@ msgstr ""
 "No existeixen paraules que concordin a la llista de paraules malsonants de %"
 "s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "No existeixen instàncies similars a la llista d'excepcions al límit de "
 "sessions."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "No existeixen instàncies similars a la llista de AKILLs."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "No existeixen instàncies similars a la llista de SNLINEs."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "No existeixen instàncies similars a la llista de SQLINEs."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "No existeixen instàncies similars a la llista de SZLINEs."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Cap memo pot ser cancelat."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "No hi ha notícies de oper per esborrar!"
@@ -4228,16 +3948,12 @@ msgstr "No hi ha notícies de oper per esborrar!"
 msgid "No random news items to delete!"
 msgstr "No hi ha notícies a l'atzar per esborrar!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Sense raó"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sense firma de kick quant SIGNKICK LEVEL es utilitzat"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Cap"
 
@@ -4245,7 +3961,7 @@ msgstr "Cap"
 msgid "Not allowed to join channel"
 msgstr "No es possible entra a un canal si esta RESTRINGIT"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4257,28 +3973,28 @@ msgstr ""
 "del canal entri en aquest periode de temps) sera\n"
 "automaticament eliminat."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Num  Límit Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Notícia de OP"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4287,13 +4003,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "La informació antiga es igual a la nova."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice option for %s is now ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice option for %s is now ON."
 
 #: modules/core/os_news.cpp:55
@@ -4302,132 +4023,96 @@ msgid "Oper news item #%d deleted."
 msgstr "Noticia de oper #%d esborrada."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Noticia de oper #%d no trobada!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "notícies de oper:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ     : %6d registres, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Protecció de Ops"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opció %s no pot ser establerta en aquesta xarxa."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Passcode for %s is %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Clau aceptada - Has estat reconegut."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Autentificació per clau requerida per aquesta comanda.\n"
-"Intenta un altre cop després de escriure /msg %s IDENTIFY clau."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Clau incorrecta."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La clau per %s es %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Clau incorrecta."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La clau de %s ha estat enviada."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Pau"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace option for %s is now ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Please contact an Operator to get a vhost assigned to this nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Per favor intenti novamente amb una clau mes oculta. Les claus han de ser de "
-"com a mínim 5 caràcters, no han de ser fàcils d'encertar (ex. Nom real o "
-"Nick), i no poden contenir el caràcter d'espai o tabulació."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Please use the symbol of # when attempting to register"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Per favor espera %d segons i intenta un altre cop."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilitzar la comanda GROUP novament."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4444,63 +4129,122 @@ msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilizar la comanda SEND un altre cop."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Evita que un canal es faci servir"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Prevent a channel from being used preserving\n"
+"               channel data and settings"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Impossibilita que un nickname sigui utilitzat"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privat"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "Mode privado del bot %s esta ara activat."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now on."
+msgstr "Mode privado del bot %s esta ara activat."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "Private option for %s is now ON."
+
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now on."
 msgstr "Private option for %s is now ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Protecció"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [text|numero]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {llista | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [clau]"
 
@@ -4508,15 +4252,15 @@ msgstr "RECOVER nickname [clau]"
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descripció"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [clau]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
@@ -4526,290 +4270,368 @@ msgid "Random news item #%d deleted."
 msgstr "Notícia a l'atzar #%d esborrada."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Noticia a l'atzar #%d no trobada!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Notícies al Azar:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Llegeix un o més memos"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Redefine el significat de nivells d'accés"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE    Repren possesió del teu nick després de RECOVER"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Regula l'ús de comandes critiques"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Releases a suspended channel"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Recarrega la configuració dels serveis"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
 msgstr ""
-"Registration step 1 may have expired, please use \"/msg %s register "
-"<password> <email>\" first."
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Restringeix l'accés al canal"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "accés restringit"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr "Restricted access option for %s is now ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_restricted.cpp:34
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now on."
+msgstr "Restricted access option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Rete el topic quant el canal no\n"
+"                  esta en uso"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Recupera la clau per un nickname\n"
+"               (sols si encriptació esta deshabilitada)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Returns the current access level of a user\n"
+"               on a channel"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY canal text"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | canal} text"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "La comanda SENDPASS no esta disponible per l'us d'encriptació."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST límit"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal Opció establiments"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET canal opció per ametres"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opcio per ametres"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET Opció estabilment"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] límit"
 
@@ -4817,7 +4639,7 @@ msgstr "SET LIMIT [canal] límit"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuari | canal] {límit | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
@@ -4825,24 +4647,24 @@ msgstr "SET MSG {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "La llista de SNLINEs esta buida."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4850,16 +4672,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista}[:"
 "raó]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "La llista de SQLINEs esta buida."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4868,54 +4690,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Clau aceptada - Has estat reconegut."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Clau aceptada - Has estat reconegut."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "La llista de SZLINEs esta buida."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4924,64 +4756,122 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiració] {mascara | llista} "
 "[raó]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr ""
+"    RESTART     Guarda la base de dades dels serveis i\n"
+"                reinicia els serveis"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Segur"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Fundador Segur"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Ops Segurs"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "Secure founder option for %s is now ON."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr "Secure ops option for %s is now ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now on."
+msgstr "Secure ops option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Secure option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_set_secure.cpp:36
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Segur"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Envia un memo a un nick o canal"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF  Send a memo to all opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Send a memo to all registered users"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Envia un missatge a totss els usuaris"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Envia una noticia quant les comandes\n"
+"                  OP/DEOP son utilitzats"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Sends a memo and requests a read receipt"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Serveis ara en Mode expire."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Serveis ara en Mode no expire."
 
@@ -4993,7 +4883,7 @@ msgstr "Serveis ara en Mode nomès lectura."
 msgid "Services are now in read-write mode."
 msgstr "Serveis ara en Mode de lectura-escriptura."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Serveis ara en Mode debug (nivell %d)."
@@ -5006,7 +4896,7 @@ msgstr "Serveis ara en Mode debug."
 msgid "Services are now in non-debug mode."
 msgstr "Serveis ara en Mode no-debug."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Els serveis han estat configurats per no enviar email"
 
@@ -5016,7 +4906,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5025,150 +4915,191 @@ msgstr ""
 "Els serveis no han pogut canviar Modes. Estan les linees U: dels teus "
 "servidors configurades correctament?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Serveis amunt %d dies, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Serveis amunt %d hores, %d minuts"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Serveis amunt %d minuts, %d segons"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "L'arxiu de configuració de serveis ha estat carregat novament."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "El teu nick ha estat alliberat pels serveis."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Límit de sessió per a %s establert a %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Límits de sessions no disponibles."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions     : %6d registres, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Establir opcions i informació d'un canal"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr ""
+"    BANTYPE       Estableix com els serveis posen bans\n"
+"                  en el canal"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Estableix opcions relacionades a memos"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Estableix proteccions, inclouent kills"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Estableix la descripció del canal"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Estableix el display del teu grup amb serveis"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Estableix el fundador d'un canal"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Estableix el llenguatge amb el que els serveis\n"
+"                   t'enviaran missatges"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Estableix el successor d'un canal"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Set the vhost for all nicks in a group"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Set the vhost of another user"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Estableix varies opcions globals dels serveis"
+
+#: modules/core/ns_set.cpp:169
 #, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Estableix la clau del teu nickname"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Opció %s no coneguda. Escriu /msg %s HELP LEVELS DESC per a una llista de "
 "opcións valides."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "L'establiment per a DEBUG ha de ser ON, OFF, o un numero positiu."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Establiment per a NOEXPIRE ha de ser ON o OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "L'establiment per a READONLY ha de ser ON o OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signed kick option for %s is now ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       mostra estatus dels serveis i la xarxa"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Firma kicks fets amb la comanda KICK"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5177,27 +5108,33 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Kicks Signats"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Ho sento, el assignament de bots esta temporalment inhabilitat."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Ho sento, la creació de bot ha fallat"
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Ho sento, la modificació de bots esta temporalment inabilitada."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a bot esta temporalment inhabilitat"
@@ -5210,7 +5147,7 @@ msgstr ""
 "Ho sento, la modificació de la llista AOP de canals esta\n"
 "temporalment deshabilitada."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la modificació d'accés a canals esta temporalment inabilitada."
@@ -5221,69 +5158,46 @@ msgstr ""
 "Ho sento, la modificació de kicks automàtics a canals esta temporalment "
 "inabilitada."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la llista de  paraules malsonants per a canals esta temporalment "
 "inabilitada."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Ho sento, el desenregistrament de canals esta temporalment desabilitat."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-"Ho sento, l'establiment d'Opciós de canal esta temporalment deshAbilitat."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Ho sento, el registre de canals esta temporalment inhabilitat."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Ho sento, la identificació ha fallat."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Ho sento, la configuració de kicker esta temporalment inabilitada."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a memos esta temporalment inhabilitat."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Ho sento, l'enviament de memos esta temporalment inhabilitat."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Ho sento, desenregistrament de nickname esta temporalment inhabilitat."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Ho sento, La agrupació de nicks esta temporalment inabilitada."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-"Ho sento, el seteig de Opciós per nicknames esta temporalment inhabilitat."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Ho sento, el registre de nicknames esta temporalment deshabilitat."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Ho sento, error en el registre."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5297,13 +5211,13 @@ msgstr ""
 "Ho sento, sols pots tenir %d instàncies a la teva lllista d'accés per "
 "nickname."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Ho sento, sols pots tenir %d instàncies d'accés en un determinat canal."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
@@ -5314,21 +5228,18 @@ msgstr ""
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Ho sento, sols pots tenir %d paraules malsonants en un canal."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Ho sento, has sobrepassat el teu límit de %d canals."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Ho sento, has arribat al teu límit de %d canals."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr ""
+"Ho sento, sols pots tenir %d instàncies a la teva lllista d'accés per "
+"nickname."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Estadistiques restablertes."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
@@ -5340,12 +5251,24 @@ msgstr "Para de floodejar!"
 msgid "Stop repeating yourself!"
 msgstr "No repeteixis com l'allioli!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr ""
+"    SECUREFOUNDER Estricto control de l'estatus de fundador\n"
+"                  del canal"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Estricte control de l'estatus de chanop"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Sucessor de %s desabilitat."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Sucessor de %s cambiat a %s."
@@ -5354,21 +5277,36 @@ msgstr "Sucessor de %s cambiat a %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Simbiosis"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Mode Simbiosis ara activat en el canal %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Mode Simbiosis ara activat en el canal %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Syncs the vhost for all nicks in a group"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintàxis: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5396,7 +5334,7 @@ msgstr ""
 "2: ban de la forma *!*@host\n"
 "3: ban de la forma *!*usuari@*.domini"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5409,7 +5347,7 @@ msgstr ""
 "Estableix la descripció pel canal, la que es mostrada\n"
 "amb les comandes LIST i INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5422,7 +5360,7 @@ msgstr ""
 "Canvia el fundador d'un canal. El nou nickname ha de\n"
 "ser un d'enregistrat."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5442,7 +5380,7 @@ msgstr ""
 "sorti del canal, i sigui restaurat la pròxima vegada que\n"
 "el canal sigui creat."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5459,7 +5397,7 @@ msgstr ""
 "a l'usuari del canal quan les comandes OP o DEOP siguin\n"
 "utilitzades per a un usuari en el canal."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5477,7 +5415,7 @@ msgstr ""
 "d'un usuari amb nivelll igual o superior a ell via\n"
 "comandes de %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5522,7 +5460,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5536,7 +5475,7 @@ msgstr ""
 "Quan privacitat està establerta, un /msg %s LIST no\n"
 "inclourà el canal en cap llista."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5551,7 +5490,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5571,7 +5510,7 @@ msgstr ""
 "atorgat accés al canal controlat per la llista de\n"
 "accés."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5590,7 +5529,7 @@ msgstr ""
 "el seu fundador i el seu sucesor, i no aquells que estiguin identificats\n"
 "amb %s."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5613,7 +5552,24 @@ msgstr ""
 "si no hi haguès un successor. El nou nickname ha de ser un\n"
 "d'enregistrat."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintàxi: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Habilita o deshabilita L'opció de fixació de topic\n"
+"per a un canal. Quan la fixació de topic està\n"
+"establerta, %s no permetrà que el topico del canal\n"
+"sigui canviat excepte amb la comanda TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5658,8 +5614,8 @@ msgstr ""
 "Canviar de llistes xOP al sistema de llistes d'accés no causa cap\n"
 "problema."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5749,7 +5705,7 @@ msgstr ""
 "La comanda ACCESS CLEAR neteja totes les instàncies\n"
 "de la llista d'accés."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5798,7 +5754,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra la llista d'accés actual."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5810,7 +5766,7 @@ msgstr ""
 "Fa que el bot fagi l'equivalent a la comanda \"/me\"\n"
 "en el canal especificat utilitzant el text especificat."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5830,7 +5786,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5854,7 +5810,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5912,7 +5868,7 @@ msgstr ""
 "La comanda AKICK CLEAR neteja totes les instàncies\n"
 "de la llista de akicks."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -6005,7 +5961,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6044,7 +6000,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6062,7 +6018,7 @@ msgstr ""
 "level access or greater on.\n"
 "This use limited to Services Operators."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6092,17 +6048,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintàxi: AOP canal ADD nick\n"
 "          AOP canal DEL {nick | instancia | llista}\n"
@@ -6147,7 +6092,7 @@ msgstr ""
 "de accés i /msg %s HELP SET XOP per a saber com canviar\n"
 "entre la llista de accés i el sistema de llistes xOP."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6161,8 +6106,8 @@ msgstr ""
 "Desprès d'això pots configurar el bot segons\n"
 "les teves necessitats."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6183,20 +6128,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Sintàxi: BADWORDS canal ADD paraula [SINGLE | START | END]\n"
 "          BADWORDS canal DEL {paraula | nom | llista}\n"
@@ -6236,7 +6167,7 @@ msgstr ""
 "La comanda BADWORDS CLEAR neteja totes les instàncies\n"
 "de la llista de paraules malsonants."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6252,7 +6183,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell d'\n"
 "accés 5 i major en el canal."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6294,7 +6225,7 @@ msgstr ""
 "sera eliminat. A més, si un usuari està actualment\n"
 "usant el nick, serà killejat."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6304,7 +6235,7 @@ msgstr ""
 "\n"
 "Llista tots els bots disponibles en aquesta xarxa."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6317,7 +6248,21 @@ msgstr ""
 "sempre i quan no hagi sigut llegit al moment en el que\n"
 "vas fer servir la comanda."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6329,7 +6274,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6352,7 +6297,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6364,7 +6309,7 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6379,7 +6324,7 @@ msgstr ""
 "\n"
 "Limitat a aquells amb nivelll de fundador en el canal."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6389,16 +6334,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6415,7 +6373,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6427,7 +6385,7 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6449,7 +6407,7 @@ msgstr ""
 "accés 5 i major en el canal, o a HOPs o aquells amb\n"
 "nivelll 4 i major per a treure's halfop a si mateixos."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6460,7 +6418,7 @@ msgstr ""
 "database.\n"
 "Limited to Services operators."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6497,7 +6455,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Esborra els memos enumerats 2 a 5 i 7 a 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6509,7 +6467,7 @@ msgstr ""
 "that of the given nick.\n"
 "Limited to Host Removers."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6529,7 +6487,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
 "accés 5 i major en el canal."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6548,7 +6506,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
 "accés 5 i major en el canal."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6568,7 +6526,7 @@ msgstr ""
 "amb nivelll 10 i major en el canal per a desprotegir-se a\n"
 "si mateixos."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6590,7 +6548,7 @@ msgstr ""
 "accés 5 i major en el canal, o a VOPs o aquells amb\n"
 "nivelll 3 i major per a donar-se voice a si mateixos."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6602,7 +6560,7 @@ msgstr ""
 "Desenregistra el canal especificat. Nomès pot ser utilitzat pel\n"
 "fundador del canal."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6615,8 +6573,8 @@ msgstr ""
 "administradors de serveis poden eliminar un\n"
 "canal per el qual no s'haguin identificado."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6646,7 +6604,7 @@ msgstr ""
 "Abans d'utilitzar aquesta comanda has d'identificar-te amb la teva\n"
 "clau (/msg %s HELP IDENTIFY per més informació)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6669,7 +6627,7 @@ msgstr ""
 "privilegis especials. Eliminar qualsevol nick esta\n"
 "limitat a administradors de serveis."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6754,7 +6712,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6772,7 +6730,7 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6790,7 +6748,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6804,7 +6762,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6814,7 +6772,7 @@ msgstr ""
 "\n"
 "Retorna la clau del canal donat."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6835,7 +6793,7 @@ msgstr ""
 "\n"
 "Aquesta comanda no esta disponible si encriptació esta habilitada."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6867,7 +6825,7 @@ msgstr ""
 "grup d'aquest nick, o has de proveir la clau correcta\n"
 "per aquest nickname."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6877,7 +6835,7 @@ msgstr ""
 "\n"
 "Llista tots els nicks en el teu grup."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6910,7 +6868,7 @@ msgstr ""
 "Permet als Administrators a enviar missatges als usuaris de\n"
 "la xarxa. El missatge sera enviat desde el nick %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6924,7 +6882,8 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6988,7 +6947,7 @@ msgstr ""
 "Tingues en compte: tots els nicks en un grup comparteixen la\n"
 "mateixa clau."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7009,7 +6968,7 @@ msgstr ""
 "accés 5 i major en el canal, o a HOPs o aquells amb nivelll\n"
 "4 i major per a donar-se halfop a si mateixos."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7038,16 +6997,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintàxi: HOP canal ADD nick\n"
 "          HOP canal DEL {nick | instancia | llista}\n"
@@ -7089,7 +7038,7 @@ msgstr ""
 "d'accés i /msg %s HELP SET XOP per a saber com canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7107,7 +7056,7 @@ msgstr ""
 "comanda abans d'utilitzar-les. La clau hauria de ser la mateixa\n"
 "que va ser enviada amb la comanda REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7117,7 +7066,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7150,7 +7099,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7168,7 +7117,7 @@ msgstr ""
 "Si ALL és especificat, el misatge d'entrada i\n"
 "sucsesor també seran mostrats."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7182,7 +7131,7 @@ msgstr ""
 "tal com el propietari del nick, l'ultima adreça utilitzada\n"
 "i temps, i opcions del nick."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7198,7 +7147,7 @@ msgstr ""
 "pots rebre. Amb un paràmetre, mostra la mateixa\n"
 "informació pel canal donat."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7225,7 +7174,7 @@ msgstr ""
 "informació pel nickname donat. Aquest us està\n"
 "limitat a administradors de serveis."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7244,7 +7193,7 @@ msgstr ""
 "rebràs informació sobre el bot, així com temps\n"
 "de creació o nom de canals en els que aquest estigui."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7289,7 +7238,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7305,7 +7254,8 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell d'\n"
 "accés 5 i major en el canal."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7331,7 +7281,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7353,8 +7303,8 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7423,7 +7373,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7441,7 +7391,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7459,7 +7409,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7488,7 +7438,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7507,7 +7457,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7530,7 +7480,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7546,7 +7496,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7565,7 +7515,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7584,7 +7534,7 @@ msgstr ""
 "abans de ser banejat. No cal especificar ttb per a deshabilitar\n"
 "el sistema de ban un cop activat."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7637,7 +7587,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7662,7 +7612,7 @@ msgstr ""
 "number of items to display to a operator at any 1 time.\n"
 "Limited to Services operators."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7677,7 +7627,7 @@ msgstr ""
 "donat (canals amb l'opció PRIVATE establerta no són\n"
 "llistats.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7717,7 +7667,7 @@ msgstr ""
 "        Llista tots els nicks registrats per usuaris amb el\n"
 "        domini aujac.org."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7777,7 +7727,7 @@ msgstr ""
 "        Llista tots els nicks registrats que hagin estat establerts\n"
 "        a no caducitat."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7800,11 +7750,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      llista memos enumerats 2 a 5 i 7 a 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintaxis: LOGONNEWS ADD texto"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7837,7 +7797,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintaxis: LOGONNEWS DEL {numero | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7853,7 +7813,7 @@ msgstr ""
 "Tingues en compte que no et sera obligatori identificar-te\n"
 "un altre cop."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7877,24 +7837,7 @@ msgstr ""
 "a l'esmentat nick a reidentificar-se. Aquest ús esta limitat a\n"
 "administradors de serveis."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintàxi: MODE canal Modes\n"
-"\n"
-"Permet als operadors de serveis establir modes de canal\n"
-"per a qualsevol canal. Els parametres son els mateixos que per la\n"
-"comando estandart /MODE.\n"
-"\n"
-"Limitat a operadors de serveis."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7921,7 +7864,24 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Sintàxi: MODE canal Modes\n"
+"\n"
+"Permet als operadors de serveis establir modes de canal\n"
+"per a qualsevol canal. Els parametres son els mateixos que per la\n"
+"comando estandart /MODE.\n"
+"\n"
+"Limitat a operadors de serveis."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7930,7 +7890,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7939,7 +7899,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lists all currently loaded modules."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7950,7 +7910,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7961,7 +7921,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7972,7 +7932,7 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -8003,7 +7963,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8015,7 +7975,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8029,7 +7989,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8041,7 +8001,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8065,7 +8025,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintaxis: OPERNEWS ADD texto"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8098,7 +8058,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintaxis: OPERNEWS DEL {numero | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8117,7 +8077,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivelll d'\n"
 "accés 5 i major en el canal."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8138,7 +8098,7 @@ msgstr ""
 "amb nivell 10 i major en el canal per a protejerse a si\n"
 "mismos."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8167,16 +8127,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8215,7 +8165,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8239,7 +8189,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintaxis: RANDOMNEWS ADD text"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8265,7 +8215,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintaxis: RANDOMNEWS DEL {numero | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8290,7 +8240,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      mostra els memos enumerats 2 a 5 i 7 a 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8338,8 +8289,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8381,8 +8332,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8448,7 +8399,7 @@ msgstr ""
 "informació sobre aquesta característica, escriu /msg %s\n"
 "HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8477,7 +8428,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8495,7 +8446,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8507,7 +8458,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8534,7 +8485,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8557,7 +8508,7 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8568,7 +8519,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8583,7 +8534,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8595,7 +8546,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8605,7 +8556,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8621,7 +8572,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8644,7 +8595,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8677,24 +8628,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8708,7 +8642,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8720,7 +8654,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8731,7 +8665,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8750,7 +8684,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8773,7 +8707,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8783,7 +8717,7 @@ msgstr ""
 "\n"
 "Fa que el bot escrigui el text especificat en el canal especificat."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8800,7 +8734,7 @@ msgstr ""
 "rebrà noticia de que ell/ella té un nou memo. El nick\n"
 "o canal receptors han d'estar registrats."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8810,7 +8744,7 @@ msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8829,7 +8763,7 @@ msgstr ""
 "Pot ser limitat a operadors d'IRC en certes\n"
 "xarxes."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8865,7 +8799,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8880,7 +8814,7 @@ msgstr ""
 "well as vhosts.\n"
 "Limited to Services operators."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8896,8 +8830,8 @@ msgstr ""
 "que no estaven a la llista d'usuaris no els serà permès \n"
 "obtenir l' estatus d'operador de canal."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8921,26 +8855,9 @@ msgstr ""
 "igual al nivelll SIGNKICK en el canal no tindran els seus kicks \n"
 "firmats. Veure /msg %s HELP LEVELS per a més informació."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintàxi: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Habilita o deshabilita L'opció de fixació de topic\n"
-"per a un canal. Quan la fixació de topic està\n"
-"establerta, %s no permetrà que el topico del canal\n"
-"sigui canviat excepte amb la comanda TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8973,7 +8890,7 @@ msgstr ""
 "Nota: L'accés a aquesta comanda esta controlat pel\n"
 "nivell SET."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8987,7 +8904,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9003,7 +8920,7 @@ msgstr ""
 "\n"
 "Opcions disponibles:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9018,7 +8935,7 @@ msgstr ""
 "kickejats pel bot, encara que no concideixen amb\n"
 "el nivell NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9033,7 +8950,7 @@ msgstr ""
 "kickejatos pel bot, encara que no coincideixin amb\n"
 "el nivell NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9066,7 +8983,7 @@ msgstr ""
 "utilitzar !op, l'usuari ha de tenir suficient\n"
 "accés pel nivell OPDEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9083,7 +9000,7 @@ msgstr ""
 "sempre i quan tinguin el suficient accés\n"
 "al canal."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9098,7 +9015,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9114,7 +9031,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9128,7 +9045,7 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9146,8 +9063,8 @@ msgstr ""
 "canals, tal como modes, KICKS i fins tot els\n"
 "missatges d'entrada."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9173,7 +9090,7 @@ msgstr ""
 "escriu /msg %s HELP SET Opció per a més informació\n"
 "sobre una opció específica."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9184,7 +9101,7 @@ msgstr ""
 "Estableix varies opcions per a nicknames. Opció pot ser\n"
 "una de:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9210,7 +9127,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9222,7 +9139,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9235,7 +9152,7 @@ msgstr ""
 "nicks en serveis. El nou display HA DE SER un nick\n"
 "del teu grup."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9249,7 +9166,7 @@ msgstr ""
 "sera mostrat quant algu demani informació\n"
 "sobre el teu nick amb la comanda INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9265,7 +9182,7 @@ msgstr ""
 "opció GREET habilitada, sempre i quant tinguis \n"
 "l'accés necessari."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9288,7 +9205,7 @@ msgstr ""
 "El segon parametre especifica si la informació ha de ser\n"
 "ocultada (OFF) o mostrada (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9321,7 +9238,7 @@ msgstr ""
 "necessari. A mes, els administradors de la xarxa poden haber\n"
 "deshabilitat aquesta opció."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9338,7 +9255,7 @@ msgstr ""
 "numero ha de ser escollit de la llista de llenguatges\n"
 "soportats:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9355,7 +9272,7 @@ msgstr ""
 "enviar-te memos. A més, no pots establir el límit més\n"
 "alt que %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9397,7 +9314,7 @@ msgstr ""
 "límit, no poden establir el límit més enllà de %d, i no\n"
 "poden establir un límit hard."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9406,7 +9323,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9420,7 +9337,7 @@ msgstr ""
 "comunicaran amb tu. Amb MSG establert, els serveis\n"
 "utilitzaran msgs, de l'altra forma utilitzaran notícies. "
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9439,7 +9356,7 @@ msgstr ""
 "Aquaquesta opció es equivalent a l'opció -noexpire\n"
 "en la linea de comandes."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9476,7 +9393,7 @@ msgstr ""
 "\n"
 "ON és escencialment LOGON i NEW combinats."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9488,7 +9405,7 @@ msgstr ""
 "Canvia la clau utilitzada per identificar-te com el\n"
 "propietari del nick."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9507,7 +9424,7 @@ msgstr ""
 "(D'altra banda, qualsevol persona que sapigue el teu nick podra comprobar\n"
 "la teva informació utilitzant la comanda INFO.)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9538,7 +9455,7 @@ msgstr ""
 "Aquesta opció es equivalent a l'opció -readonly en\n"
 "la linea de comandes."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9560,7 +9477,7 @@ msgstr ""
 "d'accés, %s no te auto-kickejara no important l'establiment de l'opció\n"
 "KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9574,7 +9491,7 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9594,7 +9511,7 @@ msgstr ""
 "added to the group after this command was used.\n"
 "Limited to Services operators."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9607,7 +9524,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9706,7 +9623,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9736,16 +9653,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintàxi: SOP canal ADD nick\n"
 "          SOP canal DEL {nick | instancia | llista}\n"
@@ -9788,7 +9695,7 @@ msgstr ""
 "d'accés i /msg %s HELP SET XOP per a saber com canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9889,7 +9796,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9899,7 +9806,7 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9909,7 +9816,7 @@ msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9953,7 +9860,7 @@ msgstr ""
 "L'opció RESET estableix el nombre màxim d'usuaris\n"
 "al nombre d'usuaris actualment presents en la xarxa."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9979,7 +9886,7 @@ msgstr ""
 "\n"
 "limitat a administradors de serveis."
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10024,7 +9931,7 @@ msgstr ""
 "reste seran ignorats. If no nickname is given, your status\n"
 "will be returned."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10042,7 +9949,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10052,7 +9959,7 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10148,7 +10055,8 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10172,21 +10080,7 @@ msgstr ""
 "Per defecte, limitat a aquells amb nivell de fundador\n"
 "en el canal."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: UMODE user modes\n"
-"\n"
-"Allows Services Operators to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10203,7 +10097,7 @@ msgstr ""
 "del bot pel canal es enmagatzemada, així et sera possible\n"
 "reassignar un bot sense haver de configurar-lo de nou."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10222,7 +10116,7 @@ msgstr ""
 "Per defecte, limitat a AOPs o aquells amb nivell 5\n"
 "i major en el canal."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10239,7 +10133,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10251,7 +10145,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10265,7 +10159,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10290,7 +10184,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10312,7 +10206,7 @@ msgstr ""
 "accés 5 i major en el canal, o a VOPs o aquells\n"
 "amb nivelll 3 i major per a donar-se voice a si mateixos."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10341,16 +10235,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintàxi: VOP canal ADD nick\n"
 "          VOP canal DEL {nick | instancia | llista}\n"
@@ -10393,7 +10277,7 @@ msgstr ""
 "d'accés i /msg %s HELP SET XOP per a saber como canviar\n"
 "entre la llista d'accés i el sistema de llistes xOP."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10409,7 +10293,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10417,7 +10301,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10425,7 +10309,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10437,51 +10321,100 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [tòpic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Temporalment elimina totes les linees O:\n"
+"                d'un servidor remotamente"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr ""
+"    SHUTDOWN    Termina el programa de serveis guardant els\n"
+"                canvios"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr ""
+"    QUIT        Termina el programa de serveis sense guardar\n"
+"                els canvis"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "The IMMED option is not available on this network."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "La llista de AKILLs ha estat netegada."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "La llista de SNLINEs ha estat netegada."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "La llista de SQLINEs ha estat netegada."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "La llista de SZLINEs ha estat netegada."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10493,89 +10426,79 @@ msgstr ""
 "i NOJOIN són nivellls màxims, mentre tots els altres\n"
 "són nivellls mínims."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "El host %s actualment te %d sessions amb un límit de %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "El límit de memos per a %s no pot ser canviat."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "El nou display es ara %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10583,7 +10506,8 @@ msgstr ""
 "No hi ha bots disponibles en aquest moment.\n"
 "Demana-li a un administrador de serveis que en fagi un!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10593,20 +10517,12 @@ msgstr ""
 "Escriu /msg %s HELP GLIST i /msg %s HELP DROP\n"
 "per més informació."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"There is a new memo on channel %s.\n"
-"Type /msg %s READ %s %d to read it."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Ja no hi ha un bot assignat a %s."
@@ -10627,7 +10543,7 @@ msgstr "No hi ha notícies al azar."
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10645,83 +10561,38 @@ msgstr ""
 "                     per algú mes que un operador\n"
 "                     d'IRC"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "This channel has been forbidden."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Aquest canal ha estat registrat amb %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "This channel has been suspended."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Aquest canal esta prohibit."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Aquest canal no caducara."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Aquest nick pertany a un altra persona. Per favor escull un altre nick.\n"
-"(Si aquest es el teu nick, escriu /msg %s IDENTIFY clau.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Aquest nick ha estat registrat; No pots utilitzar-lo."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Aquest nick esta registrat i protegit. Si es el teu\n"
-"nick, escriu /msg %s IDENTIFY clau. Si no,\n"
-"per favor escull un nick diferent."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Aquest nickname no caducara."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Aquest nickname no pot ser utilitzat. Per favor escull un altre."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Aquest nickname no caducara."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10729,30 +10600,62 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Canvia el sistema de privilegis d'usuari"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Lock de tòpic"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Retenció de tòpic"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr ""
+"    TOPICLOCK     El topic sols pot ser canviat amb\n"
+"                  TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Topic lock option for %s is now ON."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Topic lock option for %s is now ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr "Topic retention option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Topic retention option for %s is now ON."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Desactiva les majuscules!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Activa o desactiva la protecció"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10768,7 +10671,8 @@ msgstr ""
 "    canal. Això pot ser canviat amb la comanda\n"
 "    LEVELS de %s."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10778,7 +10682,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10786,7 +10691,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10794,130 +10700,130 @@ msgstr ""
 "Escriu /msg %s HELP opció per més informació\n"
 "sobre una opció en particular."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Escriu /msg %s SET EMAIL e-mail per provar el teu e-mail.\n"
-"Respectems la teva privacitat; Aquest e-mail no sera entregat\n"
-"a cap persona."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Escriu /msg %s LIST NEW per a llistar els teus memos."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Escriu /msg %s READ %d per a llegir-lo."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Escriu /msg %s READ LAST per llegir el teu últim memo."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modes"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Escriu /msg %s SET EMAIL e-mail per provar el teu e-mail.\n"
+"Respectems la teva privacitat; Aquest e-mail no sera entregat\n"
+"a cap persona."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Un-Load a module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Opcio SET desconeguda %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opció STATS %s desconeguda."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Comanda no coneguda %s. \"/msg %s HELP\" per ajuda."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Caràcter de Mode %c desconegut i ignorat."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opció %s desconeguda."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Opció %s desconeguda.\n"
-"Escriu /msg %s HELP SET per a més informació."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Actualitzant les bases de dades."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuari      : %6d registres, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"L'usuari demanant el teu nick ha estat expulsat.\n"
-"/msg %s RELEASE %s per recuperar-lo abans %s time-out."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10925,16 +10831,35 @@ msgstr ""
 "Llista d'usuaris:\n"
 "Nick                 Mascara"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "El Fundador de %s cambiat a %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Mostra la llista de sessions de host"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Protecció de Voices"
 
@@ -10960,16 +10885,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Cuida el teu llenguatge!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ja ets membre del grup de %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10978,11 +10903,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "No estas autoritzat a estar en aquest canal."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autoritzat a canviar el teu límit de memos."
 
@@ -10990,11 +10911,12 @@ msgstr "No estas autoritzat a canviar el teu límit de memos."
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -11002,41 +10924,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Ara ets membre en el grup de %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "No pots fer GHOST a tu mateix!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Can't logout %s because he's a services operator."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "No pots recuperar-te a tu mateix!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11046,7 +10969,8 @@ msgstr ""
 "Utilitza les comandes AOP, SOP i VOP.\n"
 "Escriu /msg %s HELP comanda per a més informació."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11057,6 +10981,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11064,56 +10989,66 @@ msgstr ""
 "No pots utilitzar aquesta comanda. Utilitza la comanda ACCESS.\n"
 "Escriu /msg %s HELP ACCESS per més informació."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "No pots establir el límite de memos per %s mes de %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "No pots establir el teu límit de memos a mes de %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Tens %d memos, dels quals %d encara no han estat llegits."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Tens %d memos, dels quals 1 encara no ha estat llegit."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Tens %d memos."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Tens %d memos, cap d'ells llegit."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Tens 1 memo i encara no ha estat llegit."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Tens 1 memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "No tens memos."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11123,62 +11058,43 @@ msgstr "Tens %d memos nous."
 msgid "You have 1 new memo."
 msgstr "Tens 1 memo nou."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Tens un nou memo de %s.\n"
-"Escriu /msg %s READ %d per a llegir-lo."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Has estat desbanegat de %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "No tens límit en el numero de memos que pots mantenir."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "No tens memos."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "No tens memos nous."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Has d'assignar un bot al canal abans de poder utilitzar aquesta comanda.\n"
-"Escriu /msg %s HELP ASSIGN per a més informació."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Has de ser un operador de canal per registrar el canal."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Has de ser un operador de canal per registrar el canal."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11188,23 +11104,23 @@ msgstr ""
 "Aquest e-mail et permetra recuperar la teva clau en\n"
 "cas de que la olvidis."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Seràs notificat per nous memos quant et conectis i quant se t'enviin."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Seràs notificat per memos nous quant et conectis."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Seràs notificat quan els memos nous se t'enviin."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "No et sera possible rebre més memos."
 
@@ -11212,7 +11128,7 @@ msgstr "No et sera possible rebre més memos."
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "No seràs notificat per memos nous."
 
@@ -11220,18 +11136,20 @@ msgstr "No seràs notificat per memos nous."
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "You are already identified."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11247,35 +11165,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Your access list is empty."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Totes les linees O de %s han estat esborrades."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "La llista ignore esta buida."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "El teu límit de memos ha estat deshabilitat."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "El teu límite de memos ha estat establert a %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "El teu límit de memos es %d i no pot ser canviat."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "El teu límit de memos es %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "El teu límit de memos es 0; no rebràs nous memos."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11283,61 +11222,57 @@ msgstr ""
 "El teu límit de memos es 0; no rebràs nous memos. No pots cambiar aquest "
 "límit."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "El teu nick ha estat desconnectat."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "El teu nick ja esta registrat; escriu /msg %s DROP primer."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "El teu nick no esta registrat."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "El teu nickname ha estat expulsat."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "El teu nickname s'esta canviant a %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La teva clau es %s - Recordala per un us futur."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11356,94 +11291,95 @@ msgstr "[Notícies de Oper - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Notícies al Atzar - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "no expira"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "expira amb el pròxim update de la base de dades"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "expira en %d dia"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "expira en %d dies"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira en %d hora, %d minut"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira en %d hora, %d minuts"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira en %d hores, %d minut"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira en %d hores, %d minuts"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira en %d minuts"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira en %d minuts"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Sistema de llistes xOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "xOP lists system for %s is now ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "xOP lists system for %s is now ON."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11452,569 +11388,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canal} text"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s afegit a la llista AOP de %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s afegit a la llista HOP de %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s afegit a la llista SOP de %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s afegit a la llista VOP de %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s esborrat de la llista HOP de %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s esborrat de la llista SOP de %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s esborrat de la llista VOP de %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s moved to %s HOP list."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s moved to %s SOP list."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s moved to %s VOP list."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s no trobat a la llista HOP de %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s no trobat a la llista SOP de %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s no trobat a la llista VOP de %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Preveu el teu nickname d'apareixer en un\n"
-#~ "                   /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d dies"
-
-#~ msgid "%d hours"
-#~ msgstr "%d hores"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minuts"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d segons"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "La llista HOP de %s esta buida."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "La llista SOP de %s esta buida."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "La llista VOP de %s esta buida."
-
-#~ msgid "1 day"
-#~ msgstr "1 dia"
-
-#~ msgid "1 hour"
-#~ msgstr "1 hora"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minut"
-
-#~ msgid "1 second"
-#~ msgstr "1 segon"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Abilitat a utilitzar la comanda CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Abilitat a utilitzar la comanda HALFOP/DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "La llista HOP de canals %s ha estat netegada."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "La llista SOP de canals %s ha estat netegada."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "La llista VOP de canals %s ha estat netegada."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d instàncies esborrades de la llista HOP de %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d instàncies esborrades de la llista SOP de %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d instàncies esborrades de la llista VOP de %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 instància esborrada de la llista HOP de %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 instància esborrada de la llista SOP de %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 instància esborrada de la llista VOP de %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Adreça E-mail no establerta."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | llista]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Fi de la llista d'usuaris."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Missatge d'entrada per a %s no establert."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "El bot no esta al canal %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "Missatge d'entrada: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Access list for %s is empty."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Lllista d'accés per %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Missatge d'entrada per a %s canviat."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Mode fantasia ara desactivat en el canal %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Mode salutació ara desactivat en el canal %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Llista HOP per a %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Error Intern - Impossible processar petició."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Notícia d'entrada #%d esborrada."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nickname Registration (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Clau pel Nickname (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "No # found in front of channel name."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Mode no bot ara desactivat en el canal %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "No existeixen instàncies coincidents a la llista HOP de %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "No existeixen instàncies coincidents a la llista SOP de %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "No existeixen instàncies coincidents a la llista VOP de %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "No existeix la instància (#%d) a la llista AOP de %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "No existeix la instància (#%d) a la llista HOP de %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "No existeix la instància (#%d) a la llista SOP de %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "No existeix la instància (#%d) a la llista VOP de %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice option for %s is now OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace option for %s is now OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Per favor espera %d segons abans d'utilizar la comanda SEND un altre cop."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Mode privado del bot %s esta ara desactivat."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private option for %s is now OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Protection is now ON, with no delay."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER clau [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Restricted access option for %s is now OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Llista SOP per a %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s not registered"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND channel [reason]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure founder option for %s is now OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure ops option for %s is now OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure option for %s is now OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Els serveis no han pogut canviar Modes. Estan ben configurats els teus "
-#~ "servidors?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Serveis amunt %d dies, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Serveis amunt %d hora, %d minut"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Serveis amunt %d hora, %d minuts"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Serveis amunt %d hores, %d minut"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Serveis amunt %d minut, %d segon"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Serveis amunt %d minut, %d segons"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Serveis amunt %d minuts, %d segon"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signed kick option for %s is now OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Ho sento, la modificació de llistes HOP de canals esta\n"
-#~ "temporalment deshabilitada."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Ho sento, la modificació de la llista SOP de canals esta\n"
-#~ "temporalment deshabilitada."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Ho sento, la modificació de la llista VOP de canals esta\n"
-#~ "temporalment deshabilitada."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Ho sento, sols pots tenir %d instàncies de AOP/SOP/VOP\n"
-#~ "en un canal."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Mode Simbiosis ara desactivat en el canal %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Sintaxis: RANDOMNEWS ADD text"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR canal Modes-a-netegar"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Sintaxis: OPERNEWS ADD texto"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Sintàxi: SET DEBUG {ON | OFF | nom}\n"
-#~ "\n"
-#~ "Estableix el mode debug a activat o desactivat. En mode debug,\n"
-#~ "tota la informació enviada desde i cap als serveis,\n"
-#~ "a més de un numero de missatges són escrits a l'arxiu\n"
-#~ "de log.  Si s'especifica nom, el mode debug es\n"
-#~ "activat, amb el nivell de debug especificat a nom.\n"
-#~ "\n"
-#~ "Aquesta opció es equivalent a l'opció -debug en\n"
-#~ "la linea de comandes."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Sintàxis: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic lock option for %s is now OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Topic retention option for %s is now OFF."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Comanda no coneguda %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Opció %s desconeguda.\n"
-#~ "Escriu /msg %s HELP KICK per a més informació"
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "User %s not found in the nickserv db."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Llista VOP per a %s:\n"
-#~ "  Num  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "El bot %s ha estat esborrat."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Ultim memo enviat a %s va ser cancel.lat."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Your vhost of %s is now activated."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "El bot %s ha estat esborrat."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po
index 5bec2dd1e..0412f4f60 100644
--- a/language/anope.de_DE.po
+++ b/language/anope.de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:20-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: German\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s für weitere Informationen."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s hat das DEFCON-Level geändert zu %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s wurde zur Access-Liste von %s hinzugefügt mit Level %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s wurde der AutoKick-Liste von %s hinzugefügt."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s zur Bad Words-Liste von %s hinzugefügt."
+
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s wurde zur AKILL-Liste hinzugefügt."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s wurde zur SNLINE-Liste hinzugefügt."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s wurde zur SQLINE-Liste hinzugefügt."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s wurde zur SZLINE-Liste hinzugefügt."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "/msg %s Befehl. Für weitergehende Informationen zu\n"
 "einem bestimmten Befehl, tippe /msg %s HELP Befehl."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s ist dafür geschaffen, Bots in Channels \n"
 "einzubringen. Geschaffen wurde er für User, die\n"
@@ -55,8 +113,8 @@ msgstr ""
 "Für weitere Hilfe zu einem bestimmten Befehl\n"
 "tippe /msg %s HELP Befehl"
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -76,127 +134,56 @@ msgstr ""
 "/msg %s HELP Befehl.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s ist eine Einrichtung, die es erlaubt, \n"
-"dass sich IRC User untereinander kurze Textnachrichten \n"
-"senden, egal ob die Empfänger zu dem Zeitpunkt online \n"
-"sind oder nicht.\n"
-"Als Empfänger können auch Channels angegeben werden (*).\n"
-"\n"
-"Sowohl der Nickname des Senders als auch Empfängers müssen\n"
-"registriert sein, um eine Memo versenden zu können.\n"
-"\n"
-"%s's Befehle beinhalten:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s hat das DEFCON-Level geändert zu %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s wurde zur Access-Liste von %s hinzugefügt mit Level %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s wurde der AutoKick-Liste von %s hinzugefügt."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s zur Bad Words-Liste von %s hinzugefügt."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s wurde zur AKILL-Liste hinzugefügt."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s wurde zur SNLINE-Liste hinzugefügt."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s wurde zur SQLINE-Liste hinzugefügt."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s wurde zur SZLINE-Liste hinzugefügt."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s existiert bereits in der Bad Words-Liste von %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s existiert bereits auf der AutoKick-Liste von %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s existiert bereits auf der AKILL-Liste."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s ist bereits in der  EXCEPTION-Liste."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s existiert bereits auf der SNLINE-Liste."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s existiert bereits in der SQLINE Liste."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s existiert bereits auf der SZLINE-Liste."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s ist eine ungültige Ban-Zeit."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s hat deine Usermodi geändert."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -210,44 +197,44 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s gelöscht von der %s AOP-Liste."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s wurde von der Access-Liste von %s entfernt."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s wurde von der Autokick-Liste von %s entfernt."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s wurde aus der Bad Words-Liste von %s entfernt."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s wurde von der Liste der Verbindungseinschränkungen \n"
 "entfernt."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s wurde von der AKILL-Liste entfernt."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s wurde von der SNLINE-Liste entfernt."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s wurde von der SQLINE-Liste entfernt."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s wurde von der SZLINE-Liste entfernt."
@@ -257,71 +244,83 @@ msgstr "%s wurde von der SZLINE-Liste entfernt."
 msgid "%s deleted from your access list."
 msgstr "%s wurde von deiner Access-Liste entfernt."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s wurde von deiner Access-Liste entfernt."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s wurde von deiner Access-Liste entfernt."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s wurde deaktiviert im Channel %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s hat zu viele Channels auf seinen Nicknamen registriert."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s ist eine Einrichtung, die es erlaubt, \n"
+"dass sich IRC User untereinander kurze Textnachrichten \n"
+"senden, egal ob die Empfänger zu dem Zeitpunkt online \n"
+"sind oder nicht.\n"
+"Als Empfänger können auch Channels angegeben werden (*).\n"
+"\n"
+"Sowohl der Nickname des Senders als auch Empfängers müssen\n"
+"registriert sein, um eine Memo versenden zu können.\n"
+"\n"
+"%s's Befehle beinhalten:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s wird bereits von %s getroffen."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s wurde zu deiner Access-Liste hinzugefügt."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s ist kein gültiger Ban-Typ."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s ist kein gültiger Bot bzw. registrierter Channel."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s ist keine gültige eMail-Adresse."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s ist derzeit nicht im channel %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "Der Nickname %s wurde nicht in der Ignore-Liste gefunden."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s passt zur Ausnahme von %s und kann nicht gebannt werden, solange die "
-"Ausnahme nicht gelöscht wird."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -332,12 +331,12 @@ msgstr "%s wurde auf die %s AOP-Liste verschoben."
 msgid "%s not found on %s %s list."
 msgstr "%s wurde nicht in der %s AOP-Liste gefunden."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s wurde auf der Access-Liste von %s nicht gefunden."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s wurde nicht auf der AutoKick-Liste von %s gefunden."
@@ -347,34 +346,34 @@ msgstr "%s wurde nicht auf der AutoKick-Liste von %s gefunden."
 msgid "%s not found on %s bad words list."
 msgstr "%s nicht in der Bad Words-Liste von %s gefunden."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "Es wurde keine Verbindung von %s gefunden."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr ""
 "%s nicht gefunden in der Liste der Verbindungs-\n"
 "einschränkungen."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s wurde nicht auf der AKILL-Liste gefunden."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s wurde nicht auf der SNLINE-Liste gefunden."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s wurde nicht auf der SQLINE-Liste gefunden."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s wurde nicht auf der SZLINE-Liste gefunden."
@@ -384,12 +383,17 @@ msgstr "%s wurde nicht auf der SZLINE-Liste gefunden."
 msgid "%s not found on your access list."
 msgstr "%s wurde nicht auf deiner Access-Liste gefunden."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s wurde nicht auf deiner Access-Liste gefunden."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s wurde von deiner Access-Liste entfernt."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -413,20 +417,14 @@ msgstr "%s wird jetzt für %s ignoriert."
 msgid "%s will now permanently be ignored."
 msgstr "%s will wird jetzt permanent ignoriert."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr ""
 "Achtung: Alle Befehle die an %s gesendet werden,\n"
 "werden geloggt!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Achtung: Services sind im Read-Only-Modus, Änderungen werden nicht "
-"übernommen!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -434,11 +432,12 @@ msgstr ""
 "Achtung: AKILL-Masken dürfen keine Nicknamen enthalten, stelle sicher, dass "
 "du keinen in der Hostmaske eingetragen hast."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Achtung: Man kann nur IP-Masken zur SZLINE-Liste hinzufügen."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -494,22 +493,22 @@ msgstr "[auto-memo] Die Memo die du gesendet hast wurde angesehen."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER Passwort eMail"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER Passwort eMail"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP Ziel Passwort"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -526,7 +525,7 @@ msgstr ""
 "Missbrauch von %s wird geahndet und resultiert mindestens im \n"
 "Verlust deiner registrierten Nicknamen."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -538,7 +537,8 @@ msgstr ""
 "DROPEN (löschen), Zugriffslisten oder Channel-Einstellungen\n"
 "ansehen ohne sich vorher für den Channel identifizieren zu müssen."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -551,1039 +551,343 @@ msgstr ""
 "jeden Nicknamen ansehen und bearbeiten. Siehe :\n"
 "/msg %s ACCESS LIST Nickname"
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "           Optionen : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "                   vHost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvHost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Botnick : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           Botnick : noch nicht zugewiesen."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "                Optionen: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "        Caps kicker : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "        Caps kicker : %s (%d Kick(s) bis zum Ban, Minimum %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "        Caps kicker : %s (Minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "           Gründer: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "           Ban-Typ: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "       Bolds kicker : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "       Bolds kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Flood kicker : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Flood kicker : %s (%d Kick(s) bis zum Ban, %d Zeilen in %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Flood kicker : %s (%d Zeilen in %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "     Hostmaske: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Colors kicker : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Colors kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Wird am %s auslaufen."
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "           Ban-Typ: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "   Zuletzt benutzt: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Mode lock: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "      Repeat kicker : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "      Repeat kicker : %s (%d Kick(s) bis zum Ban, %d Mal)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "      Repeat kicker : %s (%d Mal)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "         Vertreter: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Vorübergehend gesperrt: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "        Caps kicker : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "       Bolds kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "     Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "     Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "     Letztes Topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "       Registriert: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (deaktiviert)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (nur Gründer)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS      Liste der autorisierten Adressen"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr ""
-"    ACCESS     Die Liste der priviligierten User\n"
-"               bearbeiten"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr "    ACT           Veranlaßt den Bot ein \"/me\" Befehl ausführen"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Die Autokick-Liste bearbeiten"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Die Autokick-Liste bearbeiten"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL        Die AutoKill-Liste bearbeiten"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      Listet Channels in dem du Zugang hast"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Verwaltet die AOP-Liste von einen Channel"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "    ASSIGN        Weist einem Channel einen Bot zu"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr ""
-"    AUTOOP       Sollten Dir die Services automatisch\n"
-"                 Op-Status geben.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr ""
-"    AUTOOP     Sollten die Services dem Nick automatisch seinen\n"
-"               Op-Status geben."
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "    BADWORDS      Verwaltet die Bad-Word-Liste"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bant den angegebenen Nicknamen aus einen Channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr ""
-"    BANTYPE       Ändert den Ban-Typ, den die Services\n"
-"                  in dem Channel anwenden"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "    BOT           Verwaltung von Bots"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "    BOTLIST       Zeigt alle vorhandenen Bots an"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Annulliert deine letzte gesendete Memo"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL      AKILL alle User des angegebenen  Channels"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST      Alle registrierten Channels anzeigen"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr ""
-"    CHECK  Überprüft ob deine letzte gesendete Memo an\n"
-"           einen Nicknamen gelesen wurde"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr ""
-"    CLEAR      Entfernt bestimmte Einstellungen des angegebenen Channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Bestätigt einen \"nickserv auth code\"."
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "     Erstellt: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON        Ändert das  DefCon System"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr ""
-"    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens\n"
-"               in einen Channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Löscht den vHost eines Users"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Löschen einer oder mehrerer Memos"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Löscht den vHost einer Gruppe"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr ""
-"    DEOP       Enfernt den OP-Status des angegebenen Nicknamens\n"
-"               in einen Channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Entfernt dein Gründer Status in einen Channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr ""
-"    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens \n"
-"               in einen Channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Ändert die Channel-Beschreibung"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr ""
-"    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens\n"
-"               in einen Channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Setzt einen Nicknamen als Ursprung der Nickgruppe"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY      Ändert den \"Ursprung\" deiner Gruppe"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Registrierung eines Channels aufheben"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP        Die Registrierung einen Nicknamen löschen"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "      Beschreibung: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Fügt eine Emailadresse dem Nicknamen hinzu"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr ""
-"    EMAIL        Verbindet eine öffentliche eMail-Adresse\n"
-"                 mit deinem Nicknamen         "
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr ""
-"    EXCEPTION     Bearbeiten der Liste der eingeschränkten Verbindungen"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Verhindert die Nutzung eines Channels"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Einen bestimmten Nicknamen verbieten"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Stellt den Gründer des Channels ein"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Gibt die passenden Nicknamen wieder, \n"
-"               welche die angegebene eMail benutzen."
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Gibt den Channel-Schlüßel wieder"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Das Passwort eines Nicknamens aus der\n"
-"               Datenbank auslesen (nur wenn keine\n"
-"               Verschlüsselung aktiv ist)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr ""
-"    GHOST      Trennt eine \"ghost\" IRC-Verbindung mit deinen Nicknamen"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Listet alle Nicknamen in deine Gruppe"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL       Eine Notice an alle User schicken"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Fügt eine Begrüssungsnachricht dem Nicknamen hinzu"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr ""
-"    GREET        Stellt eine Begrüssungsmeldung für deinen\n"
-"                 Nicknamen ein."
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr ""
-"    GROUP       Gleicht den vHost aller Nicknamen \n"
-"                in einer Gruppe an"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP       Verwaltung von Nickname-Gruppierungen"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "          Grussnachricht: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr ""
-"    HALFOP     Gibt den angegebenen User HalfOP-Status in einen Channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr ""
-"    HIDE         Versteckt bestimmte Informationen deines\n"
-"                 Nicknamens"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Verwaltet die HOP-Liste von einen Channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY    Identifizierung des Nicknames"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"    INFO          Erlaubt dir Informationen über ein BotServ ServicesBot zu "
-"sehen"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Zeigt Informationen über den angegebenen Nicknamen"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Zeigt Informationen über den angegebenen Channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Zeigt Informationen bezüglich deiner Memos an"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE          Einen Server \"jupitern\""
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Topic behalten, wenn Channel nicht\n"
-"                  benutzt wird"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "    KICK          Konfiguriert den Kicker (s.u.)"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr ""
-"    KICK         Einen User aus einem beliebigen\n"
-"                 Channel kicken"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kickt den angegebenen Nicknamen aus einen Channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL         Stellt Kill-Schutz an oder aus."
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE     Stellt die Sprache ein, in der dir die \n"
-"                 Services antworten sollen."
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr ""
-"    LEVELS     Die Einstellungen verschiedener\n"
-"               Zugriffslevel neu definieren"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Zeigt einen oder mehrere vHost Einträge an"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       Listet alle registrieten Nicknamen des angegebene Muster"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr "    LIST       Listet alle registrieten Channels des angegebene Muster"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Erzeugt eine Liste deiner Memos"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr "    LOGONNEWS     Logon-News bearbeiten"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Macht das IDENTIFY Befehl rückgängig"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE         Channel-Modes ändern"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES   Die Modi eines Channels zurücksetzen"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO       Info über ein geladenes Modul"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST       Listet die geladenen Module auf"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD       Lädt ein Modul"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD       Lädt ein Modul"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD     Entfernt ein Modul"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr ""
-"    MSG          Ändert die Methode, wie die Services mit\n"
-"                 dir kommunizieren"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr ""
-"    NOEXPIRE   Verhindert, dass der Nickname nach einer bestimmten\n"
-"               Zeit verfällt"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr "    NOOP          Alle O:Lines temporär deaktivieren"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deaktiviert deinen vHost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE         Einem User \"Operflags\" setzen"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Aktiviert deinen vHost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr ""
-"    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS      Oper News bearbeiten"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Sendet eine Notice wenn Op/Deop-Befehl\n"
-"                  benutzt werden"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gibt dir Gründer Staus in einen Channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "     Options : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Setzt das Passwort eines Nicknamens"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD     Setzt das Passwort deines Nicknamens neu"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Regulate the use of critical commands"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Den Channel vom /LIST-Befehl verstecken"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Verhindert, dass der Nickname im Befehl\n"
-"               /msg %s LIST auftaucht"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Schützt den angegebenen Nicknamen in einen Channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Verwaltet die QOP-Liste von einem Channel"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr ""
-"    QUIT          Services _ohne_ Speichern der Datenbanken\n"
-"                  beenden"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS    Definiert Nachrichten, die den Benutzern zufällig\n"
-"                  beim Verbinden angezeigt werden"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Lesen einer oder mehrerer Memos"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER     User killen, der deinen Nicknamen verwendet"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER    Registriert einen Nicknamen"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER    Registriert einen Nicknamen"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE     Hebt die Nickname-Sperre auf nach der \n"
-"                verwendung des RECOVER Befehls"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Sendet ernuet ein \"nickserv auth code\"."
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS   Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART       Datenbanken speichern und Services neustarten"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Eingeschränkter Zugriff auf den Channel"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr ""
-"    RSEND  Sendet eine Memo an einen Nickname oder Channel\n"
-"           und  sendet dir eine Empfangsbestätigung zurück"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Reverses kicker : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Reverses kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Setzt SET Einstellungen auf einen anderen Nicknamen"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr "    SAY           Veranlaßt ein Bot ein Text in einen Channel zu sagen"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Aktiviert %s's Sicherheits-funktionen"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr ""
-"    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
-"                 für deinen Nicknamen"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER Strengere Kontrolle des Founder-Status"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Strengere Kontrolle des Op-Status im Channel"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Sendet eine Memo an einen Nickname oder Channel"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Sendet eine Nachricht an alle registrierten User."
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS    Passwort vergessen? Versuch das hier."
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION       Hosts mit einer bestimmten Anzahl"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "    SET           Konfiguriert die Bot-Optionen"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Setzt einem User einen vHost"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET           Verschiedene Services Optionen einstellen"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr ""
-"    SET        Bestimmte Channel-Optionen und\n"
-"               Informationen einstellen"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET         Optionen einstellen, auch Kill-Schutz"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr ""
-"    SET    Stellt bestimmte Optionen ein in Hinsicht\n"
-"           auf Memos"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Setzt einer Gruppe einen vHost"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN      Datenbanken speichern und Services beenden"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr ""
-"    SIGNKICK      Kicks durch ChanServ in dem Channel\n"
-"                  werden durch den Kicker signiert"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE       Die SNLINE-Liste bearbeiten"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Verwaltet die SOP-Liste von einen Channel"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE       Die SQLINE-Liste bearbeiten"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr ""
-"    STAFF        Zeigt alle Nicknamen, die Zugriff auf die \n"
-"                 Services haben, Onlinestatus und Level"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF  Sendet allen Opers/Admins eine Nachricht."
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS        Status des Netzes und der Services anzeigen"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Liefert das Zugriffslevel eines Users\n"
-"               in dem Channel"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Zeigt den Status des angegebenen Nicknamens an"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Stellt den Vertreter des Founders ein"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Verbietet jegliche Nutzung des Channels.\n"
-"               Die Channel Einstellungen bleiben jedoch\n"
-"               erhalten"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspendet den angegebenen Nicknamen"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK       Erzwingt einen Nicknamen wechsel"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE       Die SZLINE-Liste bearbeiten"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Ändert den Topic des angegebenen Channels"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Topic kann nur durch TOPIC geändert werden"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE         User Modi ändern"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "    UNASSIGN      Entfernt ein ServicesBot von einen Channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP     Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Hebt ein SUSPEND wieder auf"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend den angegebenen Nicknamen"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr "    UPDATE        Die Services Datenbänke sofort speichern"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Erneuert dein gegenwärtigen Status ( Memos , Flags , vHost )"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST      Alle registrierten Nicknamen anzeigen"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "     benutzt in: %d Channel(s)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Gibt den angegebenen User Voice-Status in einen Channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Verwaltet die VOP-Liste von einen Channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Schaltet das Listen System ein oder aus"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (wird in %s auslaufen)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Bad words kicker : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Bad words kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "           eMail-Adresse: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "          ist online von: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "     Letztes Mal gesehen: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Topic gesetzt von: %s"
@@ -1593,20 +897,6 @@ msgstr " Topic gesetzt von: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1617,26 +907,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1646,41 +927,46 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s%s"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "     Echter Name: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "        Registriert seit: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Underlines kicker : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Underlines kicker : %s (%d Kick(s) bis zum Ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Nummer  Sender            Datum/Zeit"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1688,58 +974,36 @@ msgstr ""
 "\"/msg %s\" wird nicht mehr unterstützt.  Benutze \"/msg %s@%s\" oder \"/%s"
 "\" stattdessen."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE          Einen Server \"jupitern\""
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nickname:%s, vHost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nickname:%s, vHost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, fuzzy, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (von %s am %s, %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (von %s am %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1758,17 +1022,12 @@ msgstr ""
 "%5d (%s von %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Befehle von %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s wird bei neuen Memos nicht benachrichtigt."
@@ -1778,34 +1037,34 @@ msgstr "%s wird bei neuen Memos nicht benachrichtigt."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (von %s am %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Module geladen."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d Bots verfügbar."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d Nicknamen in der Gruppe."
@@ -1816,14 +1075,14 @@ msgstr "%d Nicknamen in der Gruppe."
 msgid "%s %s list is empty."
 msgstr "Die AOP-Liste von %s ist leer."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "Die Access-Liste von %s ist leer."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Die Autokick-Liste von %s ist leer."
@@ -1833,7 +1092,7 @@ msgstr "Die Autokick-Liste von %s ist leer."
 msgid "%s bad words list is empty."
 msgstr "Die Bad Words-Liste von %s ist leer."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s kann nicht gleichzeitig Gründer und Vertreter im Channel %s sein."
@@ -1843,47 +1102,47 @@ msgstr "%s kann nicht gleichzeitig Gründer und Vertreter im Channel %s sein."
 msgid "%s cannot receive memos."
 msgstr "%s kann keine Memos empfangen."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Befehle von %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "%s ist zu allgemeingültig, bitte benutze eine genauere Hostmaske."
+msgid "%s commands:"
+msgstr "Befehle von %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s hat derzeit %d Memos, von denen %d ungelesen sind."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s hat derzeit %d Memos, von denen eine ungelesen ist."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s hat derzeit %d Memos."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s hat derzeit %d Memos, von denen alle ungelesen sind."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s hat derzeit eine ungelesene Memo."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s hat derzeit eine Memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s hat derzeit keine Memos."
@@ -1893,47 +1152,27 @@ msgstr "%s hat derzeit keine Memos."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s hat zu viele Memos gespeichert und kann keine weiteren empfangen."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s hat kein Memo-Limit."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s hat keine Memos."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s hat keine Memos."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s ist %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s sind derzeit nicht verfügbar, bitte versuche es später noch einmal."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s ist derzeit online."
@@ -1955,22 +1194,22 @@ msgstr "%s ist eingeschaltet"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s verlässt den Super-Admin Mode."
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s wird bei neuen Memos nicht benachrichtigt."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s wird beim Logon und bei Ankunft neuer Memos benachrichtigt."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s wird beim Logon über neuer Memos benachrichtigt."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s wird bei Ankunft neuer Memos benachrichtigt."
@@ -1989,6 +1228,11 @@ msgstr ""
 "AOP Liste für %s:\n"
 "  Nummer  Nickname"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -2028,63 +1272,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) wurde zur der Bot-Liste hinzugefügt."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's Memo-Limit liegt bei %d, und kann nicht geändert werden."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s's Memo-Limit liegt bei %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* Setzt einen AKILL auf jeden NEU verbindenden Clienten"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Zwingt alle Channels die Modes (%s) zu setzen"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignoriert jeden non-opers mit Nachrichten"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killt jeden NEU verbindenden Clienten"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* keine MLOCK änderungen"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Keine neuen Channel-Registrierungen"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Es werden keine neuen Memos gesendet"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Keine neuen Nicknamen-Registrierungen"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Stilles ignorieren von non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Benutzt das reduzierte Session-Limit von %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<unbekannt>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Ein Massen-Memo wurde an alle regsitrierte User gesendet."
 
@@ -2097,39 +1344,29 @@ msgstr ""
 "Eine Benachrichtigungs-Memo wurde zum %s gesendet um ihn/sie zu\n"
 "informieren das du seine/ihre Memo gelesen hast."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Ein Password wurde zu %s gesendet, bitte tippe /msg %s confirm <passcode> um "
 "die Registrierung abzuschließen."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "Fehler! Eine vHost-vIdent muss das  Format einer gültiger Ident haben."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr ""
-"Fehler! Ein vHost darf nur die Zeichen A-Z, a-z, 0-9, '.' und '-' enthalten."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS Channel {ADD|DEL|LIST|CLEAR} [Nickname [Level] | entry-liste]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [Maske]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT Channel Text"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [Maske]"
@@ -2143,17 +1380,22 @@ msgstr ""
 "AKICK Channel {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [Nickname/"
 "Usermaske]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE für %s erledigt. %d User betroffen."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL      AKILL alle User des angegebenen  Channels"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "Die AKILL-Liste ist leer."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2162,43 +1404,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN Channel Nickname"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Zugriff verweigert."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Access-Level für %s in %s wurde geändert auf %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Access-Level für %s in %s ist unverändert auf %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Access-Level muss zwischen %d und einschliesslich %d liegen."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Access-Level muss grösser als 0 sein."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Zugriffslevel für Channel %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Zugriffslevel für %s wurden auf Standardwerte zurückgesetzt."
@@ -2213,20 +1446,11 @@ msgstr "Die Access-Liste für %s leer."
 msgid "Access list for %s:"
 msgstr "Access-Liste von %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Access-Liste für %s:\n"
-"  Nummer   Level  Nickname"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Access-Liste:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2235,6 +1459,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Aktiviert %s's Sicherheits-funktionen"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Aktiviert deinen vHost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2255,7 +1489,7 @@ msgstr "Neuer Oper-News-Eintrag hinzugefügt (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Neuer randomnews Eintrag hinzugefügt (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2268,22 +1502,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Alle O:Lines von %s wurden temporär entfernt."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Alle O:lines von %s wurden wiederhergestellt."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
@@ -2292,12 +1526,12 @@ msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 msgid "All logon news items deleted."
 msgstr "Alle Logon-News wurden entfernt."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Alle Memos für den Channel %s wurden gelöscht."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Alle deine Memos wurden gelöscht."
 
@@ -2309,22 +1543,22 @@ msgstr "Alle Oper-News-Einträge wurden entfernt."
 msgid "All random news items deleted."
 msgstr "Ale randomnews Einträge wurden gelöscht."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Alle User wurden aus Channel %s gekicked."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s gesetzt."
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Alle vHosts in der Gruppe %s wurden auf %s@%s gesetzt."
@@ -2446,12 +1680,38 @@ msgstr "Darf die Befehle des Fantasia-Mode benutzen"
 msgid "Allowed to view the access list"
 msgstr "Ansicht der Channel-Access-Liste erlaubt"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"    INFO          Erlaubt dir Informationen über ein BotServ ServicesBot zu "
+"sehen"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "    ASSIGN        Weist einem Channel einen Bot zu"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr ""
+"    GREET        Stellt eine Begrüssungsmeldung für deinen\n"
+"                 Nicknamen ein."
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr ""
+"    EMAIL        Verbindet eine öffentliche eMail-Adresse\n"
+"                 mit deinem Nicknamen         "
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Autokick-Liste von %s:"
@@ -2476,17 +1736,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Automatischer Voice-Status"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS Channel {ADD|DEL|LIST|CLEAR} [Wort | entry-liste] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2505,26 +1765,26 @@ msgstr ""
 "Bad Words-Liste von %s:\n"
 "  Nummer   Wort                           Typ"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Die Bad Words-Liste ist jetzt leer."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban-Typ für den Channel %s ist jetzt #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bant den angegebenen Nicknamen aus einen Channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s existiert bereits."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Bot %s gibt es nicht."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s wurde dem Channel %s zugewiesen."
@@ -2539,27 +1799,27 @@ msgstr "Bot %s wurde geändert auf %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Bot %s wurde gelöscht."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s ist bereits dem Channel %s zugewiesen."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot wird Ops kicken im %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot wird Voices kicken im %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot wird keine Ops kicken im %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot wird keine Voices kicken im %s."
@@ -2589,16 +1849,11 @@ msgstr "Bot Idents dürfen nur gültige Zeichen enthalten."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicknamen dürfen nur gültige Zeichen enthalten."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Der Bot ist nicht im Channel %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Bot-Liste:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2607,7 +1862,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2618,7 +1873,7 @@ msgstr ""
 "nach %d kicks. Benutze den BADWORDS Befehl um Wörter zur Liste\n"
 "hinzuzufügen oder zu entfernen."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2626,7 +1881,7 @@ msgstr ""
 "Bot wird jetzt auf bad words achten und kicken. Benutze den BADWORDS\n"
 "Befehl um Wörter zur Liste hinzuzufügen oder zu entfernen."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2635,11 +1890,11 @@ msgstr ""
 "Bot kickt jetzt Leute, die fett schreiben und setzt einen Ban nach\n"
 "%d Kicks des Users."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Bot kickt jetzt Leute, die fett schreiben."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2650,7 +1905,7 @@ msgstr ""
 "%d Zeichen und %d%% der gesamten Nachricht sein), und wird nach %d Kicks\n"
 "einen Ban setzen."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2659,7 +1914,7 @@ msgstr ""
 "Bot wird jetzt User mit GROSSSCHRIFT kicken (es müssen allerdings\n"
 "%d Zeichen und %d%% der gesamten Nachricht sein)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2668,11 +1923,11 @@ msgstr ""
 "Bot kickt jetzt User, die farbig schreiben, und wird einen Ban nach\n"
 "%d Kicks setzen."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Bot kickt jetzt User, die farbig schreiben."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2681,12 +1936,12 @@ msgstr ""
 "Bot wird jetzt Flooder kicken (%d Zeilen in %d Sekunden), und wird einen\n"
 "Ban setzen nach %d Kicks."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot wird jetzt Flooder kicken (%d Zeilen in %d Sekunden)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2695,11 +1950,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after \n"
 "%d kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2709,14 +1964,14 @@ msgstr ""
 "Bot kickt jetzt User die sich wiederholen ( %d Mal das Gleiche), und setzt\n"
 "einen Ban nach %d Kicks."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
 "the same thing)."
 msgstr "Bot kickt jetzt User die sich wiederholen ( %d Mal das Gleiche)"
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2725,11 +1980,11 @@ msgstr ""
 "Bot kickt User, die invertiert schreiben, und setzt einen Ban nach %d\n"
 "Kicks."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Bot kickt Leute, die invertiert schreiben."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2738,16 +1993,16 @@ msgstr ""
 "Bot kickt jetzt User, die unterstrichen schreiben, und setzt einen Ban \n"
 "nach %d Kicks."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Bot kickt jetzt User, die unterstrichen schreiben."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Bot kickt jetzt User, die farbig schreiben."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2756,185 +2011,212 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after \n"
 "%d kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "bad word Kick ist jetzt deaktiviert."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "bold Kick ist jetzt deaktiviert."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Der Bot wird GROSSSCHRIFT ignorieren und nicht kicken."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Bot wird jetzt farbige Schrift ignorieren und nicht kicken."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Bot wird jetzt Flooder ignorieren und nicht kicken."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr ""
 "Bot ignoriert jetzt jetzt User die sich wiederholen und wird nicht kicken."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot wird jetzt invertierten Schriftstil ignorieren und nicht kicken."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot wird jetzt unterstrichenen Text ignorieren und nicht kicken."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Der Bot wird GROSSSCHRIFT ignorieren und nicht kicken."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ           : %6d Einträge, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots die für IRC Operatoren reserviert sind:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes gelesen     : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes geschrieben : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {Nickname | Channel}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [Text|Nummer]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+Zeit] {Channel} [Grund]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK Nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES Channel [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR Channel was"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Annulliert deine letzte gesendete Memo"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Registrierung eines Channels aufheben"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP        Die Registrierung einen Nicknamen löschen"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Die Services können gerade keine Mail verschicken, bitte versuche es später "
 "noch einmal."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Bot-Liste:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Die Access-Liste für %s leer."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Access-Liste von %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ          : %6d Einträge, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Usermodi von %s geändert."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s hat deine Usermodi geändert."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Dieser Channel %s existiert nicht."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr ""
+"    MSG          Ändert die Methode, wie die Services mit\n"
+"                 dir kommunizieren"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Usermodi von %s geändert."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Channel %s wurde aus der Datenbank entfernt."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Der Channel %s wurde verboten von %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Der Channel %s ist bereits registriert!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Der Channel %s hat jetzt den Status \"verboten\"."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Der Channel %s ist jetzt nicht mehr auf SUSPENDED gesetzt."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Der Channel %s ist jetzt auf SUSPENDED gesetzt."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Der Channel %s ist nicht registriert."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Der Channel %s ist verboten und darf nicht verwendet werden."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Der Channel %s kann nicht registriert werden."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Der Channel %s ist registriert unter deinem Nicknamen: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Channel           : %6d Einträge, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Der Channel %s wird nach einer bestimmten Zeit auslaufen."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Der Channel %s wird nicht mehr auslaufen."
@@ -2944,33 +2226,28 @@ msgstr "Der Channel %s wird nicht mehr auslaufen."
 msgid "Channel %s %s list has been cleared."
 msgstr "Die AOP-Liste von %s wurde geleert."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Die Access-Liste von %s wurde geleert."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Die Autokick-Liste von %s wurde geleert."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Der Channel %s ist jetzt nicht mehr auf SUSPENDED gesetzt."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s ist kein gültiger Channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Channel SQLINEs werden nicht von deinem IRCd unterstützt, folglich kannst du "
 "sie nicht nutzen."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2978,7 +2255,7 @@ msgstr ""
 "Channel-Liste:\n"
 "Name                  User Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2987,7 +2264,7 @@ msgstr ""
 "Die Channels auf die %s Zugriff hat:\n"
 "  Nummer  Channel              Level     Beschreibung"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2995,16 +2272,49 @@ msgstr ""
 "Die Channels auf die du Zugriff hast:\n"
 "  Nummer  Channel              Level     Beschreibung"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr ""
+"    CHECK  Überprüft ob deine letzte gesendete Memo an\n"
+"           einen Nicknamen gelesen wurde"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "    SET           Konfiguriert die Bot-Optionen"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "    KICK          Konfiguriert den Kicker (s.u.)"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Bestätigt einen \"nickserv auth code\"."
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES   Die Modi eines Channels zurücksetzen"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Der Channel %s konnte nicht auf UNSUSPENED gesetzt werden!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Aktuelle AKILL-Liste:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -3012,15 +2322,15 @@ msgstr ""
 "Aktuelle AKILL-Liste:\n"
 "  Nummer   Maske                             Grund"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Aktuelle Module - Liste:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Aktuelle SNLINE-Liste:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3028,11 +2338,11 @@ msgstr ""
 "Aktuelle SNLINE-Liste:\n"
 "  Nummer   Maske                             Grund"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Aktuelle SQLINE Liste:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3040,11 +2350,11 @@ msgstr ""
 "Aktuelle SQLINE Liste:\n"
 "  Nummer   Maske                              Grund"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Aktuelle SZLINE-Liste:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3053,7 +2363,7 @@ msgstr ""
 "  Nummer   Maske                             Grund"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Aktuelle Liste für eingeschränkte Verbindungen:"
 
@@ -3077,56 +2387,61 @@ msgstr "Aktuelle Anzahl von SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktuelle Anzahl von SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Derzeit eingeloggte User: %d (%d Oper)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL Nickname."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [Channel] {Nummer | Liste | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL Nickname."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP Channel"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deaktiviert deinen vHost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3251,6 +2566,43 @@ msgstr "Standard Auslaufzeit von SZLINEs: 1 Minute"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Standard Auslaufzeit von SZLINEs: Kein Auslauf, permanent"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr "    LOGONNEWS     Logon-News bearbeiten"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr "    LOGONNEWS     Logon-News bearbeiten"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS      Oper News bearbeiten"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr ""
+"    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens\n"
+"               in einen Channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Löschen einer oder mehrerer Memos"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Löscht den vHost einer Gruppe"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Löscht den vHost eines Users"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3261,7 +2613,7 @@ msgstr "%d Einträge wurden von der %s AOP-Liste gelöscht."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d Einträge wurden aus der Access-Liste von %s entfernt."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d Einträge wurden aus der AutoKick-Liste von %s entfernt."
@@ -3303,7 +2655,7 @@ msgstr "Es wurden %d Einträge aus der SZLINE-Liste entfernt."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 Eintrag wurde aus der Access-Liste von %s entfernt."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 Eintrag der AutoKick-Liste von %s entfernt."
@@ -3340,32 +2692,83 @@ msgstr "Es wurde 1 Eintrag aus der SZLINE-Liste entfernt."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 Eintrag wurde von der %s AOP-Liste gelöscht."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr ""
+"    DEOP       Enfernt den OP-Status des angegebenen Nicknamens\n"
+"               in einen Channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr ""
+"    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens \n"
+"               in einen Channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Beschreibung von %s wurde geändert zu %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr ""
+"    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens\n"
+"               in einen Channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr ""
+"    GHOST      Trennt eine \"ghost\" IRC-Verbindung mit deinen Nicknamen"
+
+#: modules/core/os_staff.cpp:21
 #, fuzzy
-msgid "Disabled"
-msgstr "nicht aktiv"
+msgid "Display Services staff and online status"
+msgstr ""
+"    STAFF        Zeigt alle Nicknamen, die Zugriff auf die \n"
+"                 Services haben, Onlinestatus und Level"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Liste alle Einträge. (Count: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Einträge von %d bis %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Auf das Muster %s passenden Einträge. (Count: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Zeigt Informationen über den angegebenen Nicknamen"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Zeigt Informationen bezüglich deiner Memos an"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Zeigt einen oder mehrere vHost Einträge an"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Zeigt Informationen bezüglich deiner Memos an"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3394,171 +2797,208 @@ msgstr "Benutze nicht das Wort %s in diesem Channel!"
 msgid "Don't use underlines on this channel!"
 msgstr "Keine Unterstreichungen in diesem Channel benutzen!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail Adresse für %s wurde auf %s geändert."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail Adresse  %s wurde entfernt."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "eMail-Adresse für %s ist ungültig."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [Parameter]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Passende Emails %s bis %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "aktiv"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Ende der %s Liste."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Ende der Access-liste."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Ende der Channel-Liste."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Ende der User-Liste."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Deutsch"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Fehler! Die Ident ist zu lang, bitte nutze eine Ident mit weniger als\n"
-"%d Buchstaben."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Fehler! Der vHost ist zu lang, bitte nutze einen vHost mit weniger als\n"
-" %d Buchstaben."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "DIe Exception für %s (#%d) wurde auf die  %d Position verschoben."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception für %s ist zu %d aktualisiert worden."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Wird am %s auslaufen"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Auslaufzeit von %s geändert."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID Channel Grund"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID Channel [Grund]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID Nickname Grund"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID Nickname [Grund]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasy-Mode"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "Fantasy mode ist jetzt ON im %s."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "Fantasy mode ist jetzt ON im %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s wird nicht länger ignoriert."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Diese Hostmaske %s ist bereits auf der Access-Liste."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr "    UPDATE        Die Services Datenbänke sofort speichern"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK       Erzwingt einen Nicknamen wechsel"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS    Passwort vergessen? Versuch das hier."
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Founder von %s wurde geändert zu %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Keine WildCards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY Channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS Nickname"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS nicht verfügbar, da die Verschlüsselung aktiviert ist."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST Nickname [Passwort]"
 
@@ -3566,11 +3006,27 @@ msgstr "GHOST Nickname [Passwort]"
 msgid "GLOBAL message"
 msgstr "GLOBAL Nachricht"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Ghost mit deinem Nicknamen wurde entfernt."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE         Einem User \"Operflags\" setzen"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr ""
+"    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gibt dir Gründer Staus in einen Channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Begrüssungsnachricht"
 
@@ -3578,82 +3034,163 @@ msgstr "Begrüssungsnachricht"
 msgid "Greet message displayed"
 msgstr "Grussmeldung wird angezeigt"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Begrüssungsnachricht %s wurde auf %s geändert."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Begrüssungsnachricht %s wurde entfernt."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Begrüssungsnachricht ist jetzt ON im %s."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Begrüssungsnachricht ist jetzt ON im %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr ""
+"    HALFOP     Gibt den angegebenen User HalfOP-Status in einen Channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS   Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr ""
+"    HIDE         Versteckt bestimmte Informationen deines\n"
+"                 Nicknamens"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Den Channel vom /LIST-Befehl verstecken"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ          : %6d Einträge, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts mit mindestens %d Verbindungen:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY Passwort"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [Zeit] [Nickname | Hostmaske]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO Channel"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO Nickname"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {Channel | Nickname}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE Channel"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY    Identifizierung des Nicknames"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Wenn du ihn nicht innerhalb von 20 Sekunden identifizierst, wird er "
 "automatisch geändert."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Wenn du ihn nicht innerhalb einer Minute identifizierst, wird er automatisch "
 "geändert."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Die Ignore-Liste wurde geleert."
@@ -3662,12 +3199,13 @@ msgstr "Die Ignore-Liste wurde geleert."
 msgid "Ignore list is empty."
 msgstr "Ignore-Liste ist leer."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Bot-Liste:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3683,25 +3221,17 @@ msgstr ""
 "Tippe /msg %s HELP SET Option für Erläuterungen\n"
 "zu einer bestimmten oben genannten Option."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO       Info über ein geladenes Modul"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Information vom Bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informationen über den Channel %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Ungültige Auslaufzeit."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3709,14 +3239,11 @@ msgstr ""
 "Ungültige Hostmask. Nur echte Hostmasken sind gültig als Einträge (ohne "
 "Nicknamen und Idents)."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Ein ungültiger Passcode wurde eingegeben, prüfe bitte deine Email und gib "
-"den Code erneut ein."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3726,7 +3253,7 @@ msgstr ""
 "grösser oder gleich\n"
 "Null aber kleiner als %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Ungültiger Wert. Es muss eine gültige grade Zahl sein, die grösser als 1 ist."
@@ -3735,12 +3262,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE Servername [Grund]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP       Verwaltung von Nickname-Gruppierungen"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK Channel Option {ON|OFF} [Einstellungen]"
@@ -3749,264 +3281,449 @@ msgstr "KICK Channel Option {ON|OFF} [Einstellungen]"
 msgid "KICK channel user reason"
 msgstr "KICK Channel User Grund"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr ""
+"    KICK         Einen User aus einem beliebigen\n"
+"                 Channel kicken"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kickt den angegebenen Nicknamen aus einen Channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER     User killen, der deinen Nicknamen verwendet"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS Channel {SET | DIS[ABLE] | LIST | RESET} [item [Level]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST Muster"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST Muster [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [Channel] [Liste | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP Ziel Passwort"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Sprache wurde geändert zu Deutsch."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Die letzte Memo an %s wurde widerrufen."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Letzte Quit-Nachricht: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Letzte gesehene Hostmaske: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Der Level für %s für den Channel %s wurde geändert auf %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Der Level kann nur zwischen %d und einschliesslich %d liegen."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Der Befehl ist in diesem Modus nutzlos - Deaktiviere zuerst XOP."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Liste der gefundenen Einträge %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       Listet alle registrieten Nicknamen des angegebene Muster"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      Listet Channels in dem du Zugang hast"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST       Listet die geladenen Module auf"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste der Nicknamen in der Gruppe von %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Liste der Nicknamen in deiner Gruppe:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Erzeugt eine Liste deiner Memos"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST      Alle registrierten Channels anzeigen"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Liste der Nicknamen in deiner Gruppe:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr "    LIST       Listet alle registrieten Channels des angegebene Muster"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST      Alle registrierten Nicknamen anzeigen"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "    BOTLIST       Zeigt alle vorhandenen Bots an"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Zeigt Informationen über den angegebenen Channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD       Lädt ein Modul"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Lokale Channels können nicht registriert werden."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Logon News-Eintrag #%d wurde gelöscht."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Logon News-Eintrag #%d konnte nicht gefunden werden!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Logon News Einträge:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE Channel Modi"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO Modul-Name"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Modul-Name"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Modul-Name"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Modul-Name"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Die Autokick-Liste bearbeiten"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "    BADWORDS      Verwaltet die Bad-Word-Liste"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "    BOT           Verwaltung von Bots"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Verwaltet die HOP-Liste von einen Channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Verwaltet die VOP-Liste von einen Channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr "    ACT           Veranlaßt den Bot ein \"/me\" Befehl ausführen"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr "    SAY           Veranlaßt ein Bot ein Text in einen Channel zu sagen"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Die Autokick-Liste bearbeiten"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL        Die AutoKill-Liste bearbeiten"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON        Ändert das  DefCon System"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE       Die SNLINE-Liste bearbeiten"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE       Die SQLINE-Liste bearbeiten"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE       Die SZLINE-Liste bearbeiten"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Ändert den Topic des angegebenen Channels"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Diese Hostmaske %s ist bereits auf der Access-Liste."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Die Hostmaske sollte in dieser Form sein: user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Gibt die passenden Nicknamen wieder, \n"
+"               welche die angegebene eMail benutzen."
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "                 Maximum: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d von %s (%s).  Um sie zu löschen, tippe /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d von %s (%s).  Um sie zu löschen, tippe /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d wurde gelöscht."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Memo-Limit von %s wurde aufgehoben."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Memo-Limit von %s wurde auf %d gesetzt."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr ""
 "Memo-Limit von %s wurde auf 0 gesetzt, kein Memo-Empfang für ihn mehr "
 "möglich."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Das Memo-Limit ist zu gross, es wird reduziert auf %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo wurde an %s versandt."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Message-Mode"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "        Mode lock: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Verwaltet die AOP-Liste von einen Channel"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Verwaltet die QOP-Liste von einem Channel"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Verwaltet die SOP-Liste von einen Channel"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS      Liste der autorisierten Adressen"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr ""
+"    ACCESS     Die Liste der priviligierten User\n"
+"               bearbeiten"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr ""
+"    EXCEPTION     Bearbeiten der Liste der eingeschränkten Verbindungen"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modul %s geladen"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modul %s geladen"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modul %s entfernt"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Autor: %s geladen: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} Server"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NickServ-Aliase   : %6d Einträge, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NickServ-Gruppen  : %6d Einträge, %5d kB"
@@ -4019,11 +3736,13 @@ msgstr "Wird nicht durch den Bot-Kicker gekicked"
 msgid "New memo"
 msgstr "Neue Memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Neue Memos für %s.  Um sie zu lesen, tippe /msg %s READ Nummer"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Neue Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 
@@ -4031,142 +3750,108 @@ msgstr "Neue Memos für %s.  Um sie zu lesen, tippe /msg %s READ %s Nummer"
 msgid "News list is full!"
 msgstr "Die News-Liste ist voll!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Der Nickname %s wurde verboten von %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Der Nickname %s wurde aus der Datenbank entfernt."
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Dieser Nickname %s ist bereits registriert!"
+
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr ""
 "Der Nickname %s ist ein illegaler Nickname und kann nicht benutzt werden."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Der Nickname %s wird derzeit benutzt."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Der Nickname %s ist jetzt verboten."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Der Nickname %s ist ein teil der  Network Services."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Der Nickname %s ist nicht gesperrt."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Der Nickname %s wird derzeit nicht benutzt."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Der Nickname %s ist nicht registriert."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Der Nickname %s ist verboten und darf nicht verwendet werden."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Der Nickname %s wurde nicht in der Ignore-Liste gefunden."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Dein Nickname %s wurde auf %d Zeichen gekürzt."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nickname %s wird wieder verfallen."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nickname %s wird nicht mehr verfallen."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nickname %s hat keine Memo von dir."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Der Nickname %s wurde erfolgreich ausgeloggt."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Der Nick %s ist vorübergehend gesperrt."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Der Nickname %s ist jetzt freigegeben."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Der Nickname %s ist jetzt suspendiert."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick konnte NICHT registriert werden, versuche es später noch einmal."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nickname %s bestätigt"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Der Nickname %s wurde aus der Datenbank entfernt."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Dieser Nickname %s ist bereits registriert!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Dieser Nickname %s kann nicht registriert werden."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Dein Nickname %s ist unter deinem Host registriert worden: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Der Nickname %s wurde erfolgreich registriert."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nickname Registrierung (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4177,26 +3862,36 @@ msgstr ""
 "genutzt wurden, werden durch den automatischen Auslauf\n"
 "nach %d Tagen aus der Datenbank entfernt."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "No-Bot-Mode ist jetzt ON im Channel %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "No-Bot-Mode ist jetzt ON im Channel %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Keine eingetragenen Emails für %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Kein Bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "läuft nicht aus"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Keine Hilfe verfügbar für %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Es sind keine Informationen für das Modul %s verfügbar"
@@ -4211,14 +3906,14 @@ msgid "No matching entries on %s %s list."
 msgstr "Keine passenden Einträge in der %s AOP-Liste."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr ""
 "Es existieren keine entsprechenden Einträge in der Access-Liste von %s."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Keine entsprechenden Einträge auf der AutoKick-Liste von %s gefunden."
@@ -4229,41 +3924,45 @@ msgstr "Keine entsprechenden Einträge auf der AutoKick-Liste von %s gefunden."
 msgid "No matching entries on %s bad words list."
 msgstr "Keine entsprechenden Einträge zu %s in der Bad Words-Liste gefunden."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Keine entsprechenden Einträge in der Liste der \n"
 "Verbindungseinschränkungen."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Keine entsprechenden Einträge auf der AKILL-Liste."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Keine entsprechenden Einträge auf der SNLINE-Liste."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Keine entsprechenden Einträge auf der SQLINE-Liste."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Kein entsprechender Eintrag in der SZLINE-Liste gefunden."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Kein Memo konnte widerrufen werden."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Derzeit keine Module geladen"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Keine Oper-News-Einträge zu löschen!"
@@ -4272,16 +3971,12 @@ msgstr "Keine Oper-News-Einträge zu löschen!"
 msgid "No random news items to delete!"
 msgstr "Keine randomnews Einträge zu löschen!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Kein Grund"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Kein signierter Kick wenn SIGNKICK LEVEL genutzt wird"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Keine"
 
@@ -4289,7 +3984,7 @@ msgstr "Keine"
 msgid "Not allowed to join channel"
 msgstr "Der Channel kann nicht betreten werden, da er RESTRICTED ist."
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4299,28 +3994,28 @@ msgstr ""
 "Beachte das jeder Channel der für %d Tage nicht\n"
 "genutzt wird,automatisch auslaufen wird."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Nummer  Limit  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE Nickname Flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4329,13 +4024,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Das alten Informationen stimmen mit den neuen überein."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nickname"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice Option für %s ist jetzt ON."
 
 #: modules/core/os_news.cpp:55
@@ -4344,136 +4044,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Oper-News-Eintrag #%d wurde entfernt."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Oper-News-Eintrag #%d nicht gefunden!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper News Einträge:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ          : %6d Einträge, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Operflags %s wurden für %s hinzugefügt. "
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Op-Schutz"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Option %s kann in diesem Netzwerk nicht benutzt werden."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Passcode für %s ist %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Passwort akzeptiert - du bist jetzt angemeldet."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Um diesen Befehl nutzen zu können, musst du dich identifizieren.\n"
-"Versuch es erneut nach /msg %s IDENTIFY Passwort."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Passwort für %s wurde auf %s gesetzt."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Passwort für %s wurde geändert."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Falsches Passwort."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Passwort von %s ist %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Falsches Passwort."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Das Passwort von %s wurde per eMail verschickt."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Peace"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace Option für %s ist jetzt ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace Option für %s ist jetzt ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr ""
-"Bitte kontaktiere einen IRC Operator, um diesem Nicknamen einen vHost "
-"zuzuweisen."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Bitte versuche es nochmal mit einem besseren Passwort. \n"
-"Passworte sollten mindestens 5 Zeichen lang sein und \n"
-"nichts mit deinem Nicknamen zu tun haben. Weiterhin \n"
-"kann keine Leer oder Tabulatortaste enthalten sein."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Benutze bitte einen gültigen hostnamen, wenn du jupiterst"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr ""
-"Verwende bitte nur das Symbol # wenn du versuchst ein\n"
-"Channel zu registrieren."
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Bitte warte noch %d Sekunden und versuche es dann erneut."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Bitte warte %d Sekunden, bevor der GROUP Befehl wieder funktioniert."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4489,63 +4148,125 @@ msgstr "Bitte warte %d Sekunden bevor der RSEND Befehl wieder funktioniert."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Bitte warte %d Sekunden bis du den SEND Befehl wieder benutzen kannst."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Verhindert die Nutzung eines Channels"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Verbietet jegliche Nutzung des Channels.\n"
+"               Die Channel Einstellungen bleiben jedoch\n"
+"               erhalten"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Verhindert, dass der Nickname im Befehl\n"
+"               /msg %s LIST auftaucht"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr ""
+"    NOEXPIRE   Verhindert, dass der Nickname nach einer bestimmten\n"
+"               Zeit verfällt"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Einen bestimmten Nicknamen verbieten"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privat"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "Private-Mode des Bots im %s ist jetzt ON."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "Private-Mode des Bots im %s ist jetzt ON."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now off."
 msgstr "Private Option für %s ist jetzt ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option for %s is now on."
+msgstr "Private Option für %s ist jetzt ON."
+
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt aktiviert (ON)."
+
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
 msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt aktiviert (ON)."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Kill-Schutz"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
+msgstr "Schutz des Nicknamens %s ist jetzt aktiviert (ON)."
+
+#: modules/core/ns_set_kill.cpp:46
+#, fuzzy, c-format
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Schutz des Nicknamens %s mit verkürzter Verzögerung aktiviert (ON)."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Schutz des Nicknamens %s ohne Verzögerung aktiviert (ON)."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Schutz des Nicknamens %s ist jetzt aktiviert (ON)."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Schützt den angegebenen Nicknamen in einen Channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Unterstützte Befehle: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [Channel] {Liste | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER Nickname [Passwort]"
 
@@ -4553,15 +4274,15 @@ msgstr "RECOVER Nickname [Passwort]"
 msgid "REGISTER channel description"
 msgstr "REGISTER Channel Beschreibung"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE Nickname [Password]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {Nickname | Channel} Memo-text"
 
@@ -4571,290 +4292,373 @@ msgid "Random news item #%d deleted."
 msgstr "Randomnews Eintrag #%d gelöscht."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Randomnews Eintrag #%d nicht gefunden!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Random news Einträge:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Lesen einer oder mehrerer Memos"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
 msgstr ""
-"Registrieungs Stufe 1 ist eventuell abgelaufen, bitte nutze zuerst \"/msg %s "
-"register <password> <email>\"."
+"    LEVELS     Die Einstellungen verschiedener\n"
+"               Zugriffslevel neu definieren"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr ""
+"    RELEASE     Hebt die Nickname-Sperre auf nach der \n"
+"                verwendung des RECOVER Befehls"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER    Registriert einen Nicknamen"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER    Registriert einen Nicknamen"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Regulate the use of critical commands"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Hebt ein SUSPEND wieder auf"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD       Lädt ein Modul"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP     Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Entfernt dein Gründer Status in einen Channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Eingeschränkter Zugriff auf den Channel"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Eingeschränkter Access"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Eingeschränkter Access Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Eingeschränkter Access Option für %s ist jetzt ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Topic behalten, wenn Channel nicht\n"
+"                  benutzt wird"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Das Passwort eines Nicknamens aus der\n"
+"               Datenbank auslesen (nur wenn keine\n"
+"               Verschlüsselung aktiv ist)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Liefert das Zugriffslevel eines Users\n"
+"               in dem Channel"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Gibt den Channel-Schlüßel wieder"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Zeigt den Status des angegebenen Nicknamens an"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Macht das IDENTIFY Befehl rückgängig"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameter"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY Channel Text"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {Nickname | Channel} Memo-text"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS Nickname"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS Befehl nicht verfügbar, da die Verschlüsselung aktiviert ist."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST Limit"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET Nickname Hostmaske."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET (Channel | Bot) Option Einstellungen"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET Channel NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET Botname PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET Channel Option Parameter"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET Channel DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET Channel DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET Channel FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET Channel GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET Channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET Channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET channel NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET Channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET Channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET Channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET Channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET Channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET Channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET Channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET Channel SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET Channel SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET Channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET Channel XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET Option Parameter"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET Option Einstellungen"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE Nummer"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [Channel] Limit"
 
@@ -4862,7 +4666,7 @@ msgstr "SET LIMIT [Channel] Limit"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [User | Channel] {Limit | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4870,24 +4674,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL Nickname Hostmaske."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "Die SNLINE-Liste ist leer."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4895,16 +4699,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmask | entry-liste}[:"
 "Grund]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "SQLINE Liste ist leer."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4913,54 +4717,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Passwort akzeptiert - du bist jetzt angemeldet."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Passwort akzeptiert - du bist jetzt angemeldet."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nickname %s ist nicht online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND Channel Grund"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND Channel Grund"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND Nickname Grund"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK Nickname Neuer-Nickname "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "Die SZLINE-Liste ist leer."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4969,65 +4783,123 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+Zeit] {Hostmaske | entry-liste} "
 "[Grund]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART       Datenbanken speichern und Services neustarten"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Secure"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now off."
 msgstr "Secure Founder Option für %s ist jetzt ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure founder option for %s is now on."
+msgstr "Secure Founder Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
+msgstr "Secure-Ops Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_secureops.cpp:33
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now on."
 msgstr "Secure-Ops Option für %s ist jetzt ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secure.cpp:38
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now off."
 msgstr "Secure Option für %s ist jetzt ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option for %s is now on."
+msgstr "Secure Option für %s ist jetzt ON."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
+
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
 msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Secure-Modus"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Sendet eine Memo an einen Nickname oder Channel"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF  Sendet allen Opers/Admins eine Nachricht."
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Sendet eine Nachricht an alle registrierten User."
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL       Eine Notice an alle User schicken"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Sendet eine Notice wenn Op/Deop-Befehl\n"
+"                  benutzt werden"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr ""
+"    RSEND  Sendet eine Memo an einen Nickname oder Channel\n"
+"           und  sendet dir eine Empfangsbestätigung zurück"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Server gefunden: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Dieser Service ist derzeit deaktiviert, bitte versuche es später nochmal"
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services sind jetzt beim DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Services sind jetzt im Expire Modus."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Services sind jetzt im No Expire Modus."
 
@@ -5039,7 +4911,7 @@ msgstr "Services sind jetzt im read-only Modus."
 msgid "Services are now in read-write mode."
 msgstr "Services sind jetzt im read-write Modus."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Die Services sind jetzt im Debug-Modus (Level %d)."
@@ -5052,7 +4924,7 @@ msgstr "Die Services sind jetzt im Debug-Modus."
 msgid "Services are now in non-debug mode."
 msgstr "Die Services sind nicht mehr im Debug-Modus."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "eMail-Handling der Services wurde deaktiviert."
 
@@ -5062,7 +4934,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5071,154 +4943,203 @@ msgstr ""
 "Services können die Modi nicht ändern. Sind die U:lines des\n"
 "Servers richtig konfiguriert?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Services laufen seit %d Tagen, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services laufen seit %d Stunden, %d Minuten"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services laufen seit %d Minuten, %d Sekunden"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Server gefunden: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr ""
 "Die Services werden %s jetzt nicht mehr automatisch Op-Status geben in den "
 "Channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr ""
 "Die Services werden %s jetzt automatisch Op-Status geben in den Channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Die Services werden jetzt %s mit messages antworten."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Die Services werden jetzt %s mit notices antworten."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Die Konfigurationsdatei wurde neu eingelesen."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Die Services haben den Nicknamen wieder verfügbar gemacht."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Verbindungslimit für %s geändert auf %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Eingeschränkte Verbindungen sind deaktiviert."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Verbindungen      : %6d Einträge, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Verbindungen  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Setzt SET Einstellungen auf einen anderen Nicknamen"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr ""
+"    SET        Bestimmte Channel-Optionen und\n"
+"               Informationen einstellen"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr ""
+"    BANTYPE       Ändert den Ban-Typ, den die Services\n"
+"                  in dem Channel anwenden"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr ""
+"    SET    Stellt bestimmte Optionen ein in Hinsicht\n"
+"           auf Memos"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET         Optionen einstellen, auch Kill-Schutz"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
 #, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Ändert die Channel-Beschreibung"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Setzt einen Nicknamen als Ursprung der Nickgruppe"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY      Ändert den \"Ursprung\" deiner Gruppe"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Stellt den Gründer des Channels ein"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE     Stellt die Sprache ein, in der dir die \n"
+"                 Services antworten sollen."
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Setzt das Passwort eines Nicknamens"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Stellt den Vertreter des Founders ein"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Setzt einer Gruppe einen vHost"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Setzt einem User einen vHost"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET           Verschiedene Services Optionen einstellen"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD     Setzt das Passwort deines Nicknamens neu"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Einstellung %s ist unbekannt.  Tippe /msg %s HELP LEVELS DESC für eine "
 "ausführliche Einstellungsliste."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr ""
 "Die Einstellung von DEBUG kann nur ON, OFF, oder eine positive Zahl sein."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Die Einstellung von NOEXPIRE kann nur ON oder OFF sein."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Der Wert für READONLY muss entweder ON oder OFF sein."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Super-Admin muss ON oder OFF sein."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signierte kicks Option für %s ist jetzt ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr ""
+"    AUTOOP       Sollten Dir die Services automatisch\n"
+"                 Op-Status geben.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS        Status des Netzes und der Services anzeigen"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr ""
+"    SIGNKICK      Kicks durch ChanServ in dem Channel\n"
+"                  werden durch den Kicker signiert"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5227,27 +5148,33 @@ msgstr ""
 "Signierte kicks Option für %s ist jetzt ON, hängt aber von den\n"
 "Level des Benutzers der den Befehl verwendet ab."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signierte kicks Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signierte kicks Option für %s ist jetzt ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Signierte kicks"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "RSEND ist auf diesem Netzwerk ausgeschaltet."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Das Zuweisen von Bots ist derzeit deaktiviert."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Erstellung des Bots ist fehlgeschlagen."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Das Verändern von Bot-Einstellungen ist derzeit deaktiviert."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Die SET-Optionen sind derzeit deaktiviert."
 
@@ -5257,7 +5184,7 @@ msgstr "Die SET-Optionen sind derzeit deaktiviert."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Die Channel AOP-Liste kann derzeit nicht geändert werden."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Das Ändern der Channel-Access-Liste wurde zwischenzeitig deaktiviert."
 
@@ -5265,63 +5192,42 @@ msgstr "Das Ändern der Channel-Access-Liste wurde zwischenzeitig deaktiviert."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Das Bearbeiten der AutoKick-Liste wurde zwischenzeitlich deaktiviert."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Das Ändern der Bad Words-Liste ist derzeit deaktiviert."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Das Entfernen von Channel-Registrierungen ist derzeit deaktiviert."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Channel-Optionen sind derzeit deaktiviert."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Die Registrierung von Channels ist derzeit deaktiviert."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Das Passwort für %s konnte nicht geändert werden."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Die Identifizierung ist fehlgeschlagen."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Die Konfiguration des Kickers ist derzeit deaktiviert."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "MEMO SET Befehl wurde kurzzeitig deaktiviert."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Der Memo-Versand wurde kurzzeitig deaktiviert."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Das Entfernen von Nicknamen ist derzeit deaktiviert."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Das Gruppieren von Nicknamen ist derzeit deaktiviert."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Das Ändern der Optionen wurde deaktiviert."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Das Registrieren von Nicknamen ist derzeit deaktiviert."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Registrierung fehlgeschlagen."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5332,12 +5238,12 @@ msgstr "Die Access-Liste ist auf %d Einträge beschränkt."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Du kannst nur %d Einträge auf der Access-Liste speichern."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Die Access-Liste ist auf %d Einträge beschränkt."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Du kannst nur max. %d Einträge auf der AutoKick-Liste haben."
@@ -5347,21 +5253,16 @@ msgstr "Du kannst nur max. %d Einträge auf der AutoKick-Liste haben."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Du kannst nur %d Einträge in der Bad Words-Liste eines Channels haben."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Du hast bereits das Limit von %d registrierten Channels erreicht."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Du hast bereits %d Channels auf deinen Nicknamen registriert."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Du kannst nur %d Einträge auf der Access-Liste speichern."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistiken zurückgesetzt."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status aktualisiert (memos, vhost, chmodes, flags)."
 
@@ -5373,12 +5274,22 @@ msgstr "Hör auf zu flooden!"
 msgid "Stop repeating yourself!"
 msgstr "Hör auf dich dauernd zu wiederholen!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER Strengere Kontrolle des Founder-Status"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Strengere Kontrolle des Op-Status im Channel"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Der Eintrag des Vertreters für %s wurde entfernt."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Vertreter von %s wurde geändert zu %s."
@@ -5387,21 +5298,38 @@ msgstr "Vertreter von %s wurde geändert zu %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin muss in der services.conf eingeschaltet werden."
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspendet den angegebenen Nicknamen"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Symbiosis"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Symbiosis-Mode ist jetzt ON im %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Symbiosis-Mode ist jetzt ON im %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr ""
+"    GROUP       Gleicht den vHost aller Nicknamen \n"
+"                in einer Gruppe an"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Syntax: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5429,7 +5357,7 @@ msgstr ""
 "2: Ban in der Form *!*@host\n"
 "3: Ban in der Form *!*user@*.domain"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5442,7 +5370,7 @@ msgstr ""
 "Ändert die Beschreibung für einen Channel, die bei\n"
 "dem LIST und INFO Befehl angezeigt wird."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5455,7 +5383,7 @@ msgstr ""
 "Ändert den Gründer (Founder) eines Channels. Der neue\n"
 "Nickname muss registriert sein."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5475,7 +5403,7 @@ msgstr ""
 "wiederhergestellt sobald jemand wieder in den Channel \n"
 "kommt."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5493,7 +5421,7 @@ msgstr ""
 "Notice an den Channel wenn OP oder DEOP Befehle\n"
 "benutzt werden."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5509,7 +5437,7 @@ msgstr ""
 "mit gleichem oder höherem Zugriffslevel nicht mehr per \n"
 "%s  kicken, bannen oder dessen Channelstatus löschen."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5554,7 +5482,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5568,7 +5497,7 @@ msgstr ""
 "oder aus. Wird er aktiviert, wird der Channel in der\n"
 "Ausgabe von/msg %s LIST nicht mehr auftauchen."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5583,7 +5512,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5603,7 +5532,7 @@ msgstr ""
 "identifiziert sind in den Channel gelassen, so wie es \n"
 "in der Zugriffsliste des Channels steht."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5624,7 +5553,7 @@ msgstr ""
 "per IDENTIFY gegenüber %s als Gründer (Founder) identifiziert\n"
 "hat."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5648,7 +5577,25 @@ msgstr ""
 "\n"
 "Der Nickname des Vertreters muss registriert sein."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntax: %s Channel TOPICLOCK {ON | OFF}\n"
+"\n"
+"Aktiviert oder deaktiviert die topic lock-Option\n"
+"für den angegebenen Channel.\n"
+"Wenn topic lock eingeschaltet ist, wird %s jede\n"
+"Änderung des Topics verhindern/rückgängig machen,\n"
+"ausser es wurde durch TOPIC eingestellt."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5692,8 +5639,8 @@ msgstr ""
 "Der Wechsel vom xOP System zum Access System fuktioniert\n"
 "jedoch fehlerfrei."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5785,7 +5732,7 @@ msgstr ""
 "Durch ACCESS CLEAR werden alle Einträge der\n"
 "Zugriffsliste entfernt."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5835,7 +5782,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "    Zeigt die aktuelle Zugriffsliste an."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5846,7 +5793,7 @@ msgstr ""
 "\n"
 "Bringt den Bot dazu, /me text auf dem angegebenen Channel auszugeben."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5866,7 +5813,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5890,7 +5837,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5949,7 +5896,7 @@ msgstr ""
 "Der AKICK CLEAR Befehl entfernt alle Einträge aus\n"
 "Der AutoKick-Liste."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -6043,7 +5990,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR entfernt alle Einträge aus der AKILL-Liste."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6085,7 +6032,7 @@ msgstr ""
 "\n"
 "Channels mit der NOEXPIRE Option sind mit einem Ausrufezeichen markiert."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6103,7 +6050,7 @@ msgstr ""
 "Parametern werden alle Channel aufgelistet, in denen Nickname \n"
 "Zugriffslevel Level oder höher hat."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6133,17 +6080,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: AOP Channel ADD Nickname\n"
 "        AOP Channel DEL {Nickname | entry-num | Liste}\n"
@@ -6181,7 +6117,7 @@ msgstr ""
 "/msg %s HELP SET XOP für Infos über den Wechsel vom XOP und \n"
 "vom Access System."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6196,8 +6132,8 @@ msgstr ""
 "Channel-spezifischen Einstellungen des Bots angepasst \n"
 "werden."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6218,20 +6154,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Syntax: BADWORDS Channel ADD Wort [SINGLE | START | END]\n"
 "        BADWORDS Channel DEL {Wort | entry-num | Liste}\n"
@@ -6270,7 +6192,7 @@ msgstr ""
 "Der BADWORDS CLEAR Befehl löscht alle Einträge aus der\n"
 "Bad-Word-Liste."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6286,7 +6208,7 @@ msgstr ""
 "Standardmässig auf AOPs oder User mit Access Level 5 oder\n"
 "höher beschränkt."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6325,7 +6247,7 @@ msgstr ""
 "der User mit diesem Nicknamen online ist, wird dieser \n"
 "entfernt (gekillt)."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6335,7 +6257,7 @@ msgstr ""
 "\n"
 "Zeigt alle verfügbaren Bots des Netzwerkes."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6348,7 +6270,21 @@ msgstr ""
 "oder Channel gesendet hast, vorrausgesetzt sie ist noch nicht\n"
 "gelesen worden."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6360,7 +6296,7 @@ msgstr ""
 "Es werden die Einträge und komplette reale ident@host für jeden \n"
 "Nickname benutzt, dann wird der AKILL durchgeführt. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6383,7 +6319,7 @@ msgstr ""
 "Parameter SECRET angegeben, werden nur Channel aufgelistet, \n"
 "die Mode +s oder Mode +p gesetzt haben."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6395,7 +6331,7 @@ msgstr ""
 "Überprüft ob deine letzte gesendete Memo an einen Nicknamen gelesen\n"
 "worden ist oder nicht. Der CHECK Befehl funktioniert nicht mit Channels."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6410,7 +6346,7 @@ msgstr ""
 "\n"
 "Benötigt Founder Zugriffslevel im jeweiligen Channel."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6420,16 +6356,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6445,7 +6394,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6457,7 +6406,7 @@ msgstr ""
 "von einschränkungen der Services einzubinden - nützlich während \n"
 "versuchter Angriffe auf das Netzwerk."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6480,7 +6429,7 @@ msgstr ""
 "um andere zu dehalfoppen, oder Level 4 um dich selbst zu\n"
 "dehalfoppen."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6489,7 +6438,7 @@ msgstr ""
 "Syntax: DEL Nickname\n"
 "Löscht den vHost des angegebenen Nicknamens."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6527,7 +6476,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Löscht Memos mit den Nummern 2 bis 5 und 7 bis 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6538,7 +6487,7 @@ msgstr ""
 "Löscht den vHost aller Nicknamen aus der gleichen Gruppe \n"
 "des angegeben Nicknamens."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6559,7 +6508,7 @@ msgstr ""
 "Standardmässig ist dafür ein Level von 5 oder\n"
 "grösser erforderlich."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6579,7 +6528,7 @@ msgstr ""
 "Standardmässig ist dafür ein Level von 5 oder\n"
 "grösser erforderlich."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6600,7 +6549,7 @@ msgstr ""
 "aufrufen oder von denjenigen mit Level 10 und grösser,\n"
 "die den Schutz von sich selbst aufheben wollen."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6622,7 +6571,7 @@ msgstr ""
 "um andere zu devoicen, oder Level 3 um dich selbst\n"
 "vom Voice-Flag zu befreien."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6634,7 +6583,7 @@ msgstr ""
 "Entfernt die Registrierung des angegebenen Channels.\n"
 "Kann nur vom Channel-Founder benutzt werden."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6651,8 +6600,8 @@ msgstr ""
 "(löschen) ohne sich vorher gegenüber dem Channel als \n"
 "Founder zu identifizieren."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6685,7 +6634,7 @@ msgstr ""
 "dich vorher mit deinem Passwort identifizieren. \n"
 "Tippe : /msg %s HELP IDENTIFY für weitere Informationen"
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6707,7 +6656,7 @@ msgstr ""
 "von der Datenbank entfernt. Du kannst jeden Nickname \n"
 "in deiner Gruppe ohne bestimmte Privilegien entfernen."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6797,7 +6746,7 @@ msgstr ""
 "weit treffende Einträge in der Liste der Verbindungs-\n"
 "einschränkungen senken die Performance der Services."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6816,7 +6765,7 @@ msgstr ""
 "Bei einigen Netzen muss evtl ein Grund angegeben\n"
 "werden."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6834,7 +6783,7 @@ msgstr ""
 "In bestimmten Netzen wird ein Grund für das\n"
 "Verbot benötigt."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6848,7 +6797,7 @@ msgstr ""
 "verwenden kannst. Immer, wenn dieser Befehl benutzt wird, wird\n"
 "eine Nachricht mit dem Nickname der Person mitgeloggt."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6858,7 +6807,7 @@ msgstr ""
 "\n"
 "Liefert den Key des angegebenen Channels zurück."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6879,7 +6828,7 @@ msgstr ""
 "Dieser Befehl ist nicht verfügbar bei aktivierter\n"
 "Verschlüsselung."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6911,7 +6860,7 @@ msgstr ""
 "in der Gruppe des Nicknamens sein.Weiterhin musst \n"
 "du das richtige Passwort für den Nickname haben."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6921,7 +6870,7 @@ msgstr ""
 "\n"
 "Zeigt alle Nicknamen die in deiner Gruppe enthalten sind.\t"
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6954,7 +6903,7 @@ msgstr ""
 "dem Netzwerk zu senden. Die Nachricht wird als\n"
 "Absender %s tragen."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6967,7 +6916,8 @@ msgstr ""
 "Dieser Befehl erlaubt es Usern, den vHost ihres aktuellen\n"
 "Nicknamens, zum vHost der gesamten Gruppe zu setzen."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7035,7 +6985,7 @@ msgstr ""
 "Achtung: Alle Mitglieder einer Gruppe haben dasselbe\n"
 "Passwort."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7057,7 +7007,7 @@ msgstr ""
 "um andere zu halfoppen, oder Level 4 um dich selbst zu\n"
 "halfoppen."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7086,16 +7036,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: HOP Channel ADD Nickname\n"
 "        HOP Channel DEL {Nickname | entry-num | Liste}\n"
@@ -7130,7 +7070,7 @@ msgstr ""
 "/msg %s HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7150,7 +7090,7 @@ msgstr ""
 "Registrierung, die du mit dem REGISTER Befehl \n"
 "gesetzt hast."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7160,7 +7100,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7197,7 +7137,7 @@ msgstr ""
 "\n"
 "Ignores werden nicht bei IRC Operatoren erzwungen."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7217,7 +7157,7 @@ msgstr ""
 "ALL angibst, wird die Begrüssungsnachricht und \n"
 "die Successors (Vertreter) ebenfalls angezeigt."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7235,7 +7175,7 @@ msgstr ""
 "benutzt, werden alle Informationen angezeigt.\n"
 "(Egal ob sie versteckt sind oder nicht.)"
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7251,7 +7191,7 @@ msgstr ""
 "du max. empfangen kannst. Mit angegebenem Parameter\n"
 "wird die gleiche Information über den Channel angezeigt."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7279,7 +7219,7 @@ msgstr ""
 "Informationen über den Nicknamen angezeigt. Diese\n"
 "Funktion ist beschränkt auf Services Administratoren."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7298,7 +7238,7 @@ msgstr ""
 "Parameter ein Botnick ist, werden Informationen wie \n"
 "Erstellungsdatum oder Anzahl der Channels angezeigt."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7339,7 +7279,7 @@ msgstr ""
 "wird dieser im Server Informationsfeld angezeigt,\n"
 "ansonsten nur \"Jupitered by <nick>\"."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7355,7 +7295,8 @@ msgstr ""
 "Standardmässig ist für diese Funktion ein Level\n"
 "von mindestens 5 erforderlich."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7381,7 +7322,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7403,8 +7344,8 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7472,7 +7413,7 @@ msgstr ""
 "\n"
 "*** SpamMan has been kicked off channel #my_channel by %s (chemical (Flood))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7490,7 +7431,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7509,7 +7450,7 @@ msgstr ""
 "bevor er einen Ban bekommt. Wenn keine ttb \n"
 "angegeben wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7540,7 +7481,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7559,7 +7500,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7584,7 +7525,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7600,7 +7541,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7620,7 +7561,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7639,7 +7580,7 @@ msgstr ""
 "er einen Ban bekommt. Wenn keine ttb angegeben \n"
 "wird, wird er nie gebannt."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7691,7 +7632,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7716,7 +7657,7 @@ msgstr ""
 "festes Limit für die Anzahl der dem Operator anzuzeigenden \n"
 "Einträge."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7734,7 +7675,7 @@ msgstr ""
 "numerischen Bereich angibt, Channelnamen müssen\n"
 "ohne '#' angegeben werden."
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7775,7 +7716,7 @@ msgstr ""
 "    LIST *!*@*.bar.org\n"
 "    Listet alle Nicknamen von Usern in der bar.org Domain."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7837,7 +7778,7 @@ msgstr ""
 "        Zeigt alle registrierten Nicknamen an, die das NOEXPIRE\n"
 "        Flag gesetzt haben."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7860,11 +7801,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Zeigt Memos mit den Nummern 2 bis 5 und 7 bis 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntax: LOGONNEWS ADD Text"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7897,7 +7848,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntax: LOGONNEWS DEL {Nummer | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7913,7 +7864,7 @@ msgstr ""
 "den Besitzer des Nicknamens. Beachte jedoch, dass du \n"
 "nicht mehr gewarnt wirst, dich erneut zu identifizieren."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7941,22 +7892,7 @@ msgstr ""
 "\n"
 "Diese Funktion ist beschränkt auf die Services Administartoren."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: MODE Channel Modi\n"
-"\n"
-"Erlaubt es Services Operatoren die Channel Modes eines\n"
-"beliebigen Channels zu verändern. Der Paramater hat das\n"
-"gleiche Format wie der normale /MODE Befehl."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7983,7 +7919,22 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Syntax: MODE Channel Modi\n"
+"\n"
+"Erlaubt es Services Operatoren die Channel Modes eines\n"
+"beliebigen Channels zu verändern. Der Paramater hat das\n"
+"gleiche Format wie der normale /MODE Befehl."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7993,7 +7944,7 @@ msgstr ""
 "Dieser Befehl listet Informationen über das benannte, geladene \n"
 "Module auf."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8002,7 +7953,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Listet alle derzeit geladenen Module auf."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8013,7 +7964,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8024,7 +7975,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8035,7 +7986,7 @@ msgstr ""
 "Dieser Befehl entfernt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -8065,7 +8016,7 @@ msgstr ""
 "Achtung: Der Server wird in keinster Weise\n"
 "von den Services geprüft."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8078,7 +8029,7 @@ msgstr ""
 "ein /whois auf dich anwendet, deine echte IP Adresse\n"
 "sehen."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8093,7 +8044,7 @@ msgstr ""
 "werden. Um alle Operflags zu entfernen, nutze einfach ein \n"
 "\"-\" ohne Operflags."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8105,7 +8056,7 @@ msgstr ""
 "Wenn du diesen Befehl benutzt, wird jeder User, der ein /whois\n"
 "auf dich anwendet, diesen vHost anstatt deiner Host sehen."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8130,7 +8081,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntax: OPERNEWS ADD Text"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8164,7 +8115,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntax: OPERNEWS DEL {Nummer | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8184,7 +8135,7 @@ msgstr ""
 "Standardmässig ist dafür ein Level von 5 oder\n"
 "grösser erforderlich."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8205,7 +8156,7 @@ msgstr ""
 "aufrufen oder von denjenigen mit Level 10 und grösser, \n"
 "die den Schutz auf sich selbst anwenden."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8234,16 +8185,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8282,7 +8223,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8305,7 +8246,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntax: RANDOMNEWS ADD Text"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8331,7 +8272,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntax: RANDOMNEWS DEL {Nummer | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8359,7 +8300,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Zeigt den Inhalt der Memos 2 bis 5 und 7 bis 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8411,8 +8353,8 @@ msgstr ""
 "oder in dessen Gruppe sein. Als dritte Möglichkeit\n"
 "kannst du das Passwort für den Nicknamen angeben."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8454,8 +8396,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8529,7 +8471,7 @@ msgstr ""
 "Channel-Privilegien bekommen. Für weitere Informationen\n"
 "über diese Funktion tippe /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8559,7 +8501,7 @@ msgstr ""
 "Nicknamens oder in der Gruppe des Nicknamen sein. Weiterhin \n"
 "musst du das richtige Passwort für den Nicknamen haben."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8575,7 +8517,7 @@ msgstr ""
 "sie wirksam zu machen (so wie die Services Nicknamen,\n"
 "Aktivierung der Verbindungseinschränkungen, etc.)"
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8588,7 +8530,7 @@ msgstr ""
 "(auch Passcode genannt) erneut an die gespeicherte Emailadresse\n"
 "des Users, sobald der User ihn ausführt."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8612,7 +8554,7 @@ msgstr ""
 "die Datenbanken speichern, und danach neustarten\n"
 "(die ausführbare Datei erneut aufrufen).\t"
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8635,7 +8577,7 @@ msgstr ""
 "bekommst du eine Auto-Memo die dich Informirmiert\n"
 "das der / die jenige dein Memo-Text gelesen hat."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8646,7 +8588,7 @@ msgstr ""
 "\n"
 "Setzt verschiedene Einstellungen für den Nicknamen.  Gültig für option ist:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8662,7 +8604,7 @@ msgstr ""
 "angegebenen Nicknamen automatisch Op-Status zu geben,\n"
 "wenn der Nick die Channels betritt."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8675,7 +8617,7 @@ msgstr ""
 "angezeigt wird. Der neue Ursprung muss ein Nickname der \n"
 "entsprechenden Gruppe sein."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8686,7 +8628,7 @@ msgstr ""
 "Verknüpft die angegeben Emailadresse mit dem\n"
 "Nicknamen."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8703,7 +8645,7 @@ msgstr ""
 "ist. Vorraussetzung ist, dass der Benutzer die entsprechenden\n"
 "Rechte besitzt."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8726,7 +8668,7 @@ msgstr ""
 "Der zweite Parameter bestimmt, ob die Information angezeigt\n"
 "werden soll (OFF) oder nicht (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8761,25 +8703,7 @@ msgstr ""
 "Ausserdem ist es möglich, dass die Netz-Admins\n"
 "diese Option deaktiviert haben."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Wechselt die Sprache der Services, wenn Meldungen an den\n"
-"Nicknamen gesendet werden.\n"
-"(Zum Beispiel in einer Antwort auf einen Befehl den der User gesendet hat).\n"
-"Die Nummer sollte aus der Liste der unterstützten Sprachen gewählt \n"
-"werden, die man mit tippen des Befehls /msg %s HELP SET LANGUAGE bekommt."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8795,7 +8719,7 @@ msgstr ""
 "(Queries), ansonsten werden die Antworten als Notices\n"
 "geschickt (Standard)."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8808,7 +8732,7 @@ msgstr ""
 "verfällt. Wird NOEXPIRE auf ON gesetzt verfällt\n"
 "der Nickname nie."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8820,7 +8744,7 @@ msgstr ""
 "Ändert das Passwort um sich als Besitzer eines Nicknamens\n"
 "zu identifizieren."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8842,7 +8766,7 @@ msgstr ""
 "dem INFO Befehl Informationen über den Nicknamen \n"
 "abrufen, unabhängig vom Privat-Modus.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8866,7 +8790,7 @@ msgstr ""
 "fehlender Identifizierung den Nicknamen nicht killen\n"
 "(ist von der KILL Option unabhängig)."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8876,7 +8800,7 @@ msgstr ""
 "\n"
 "Der Bot sagt den eingegebenen Text auf dem angegebenen Channel."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8894,7 +8818,7 @@ msgstr ""
 "er/sie eine neue Memo hat.\n"
 "Der Empfänger (Nickname/Channel) muss registriert sein."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8905,7 +8829,7 @@ msgstr ""
 "Sendet allen registrieten Usern eine Nachricht mit dem \n"
 "Memo-Text."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8925,7 +8849,7 @@ msgstr ""
 "Kann in manchen Netzen auf IRC Operatoren begrenzt\n"
 "sein."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8962,7 +8886,7 @@ msgstr ""
 "Siehe die Hilfe zu EXCEPTION um weitere Informationen\n"
 "über das Einschränken von Verbindungen zu erhalten."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8976,7 +8900,7 @@ msgstr ""
 "du mit SET <nickname> <ident>@<hostmaske> auch eine Ident\n"
 "wie einen vHost setzen."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8992,8 +8916,8 @@ msgstr ""
 "die nicht auf der Zugriffsliste des Channels stehen, \n"
 "keinen Op-Status erhalten."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -9018,27 +8942,9 @@ msgstr ""
 "nicht durch den Nicknamen signiert.\n"
 "Siehe /msg %s HELP LEVELS für weitere Informationen."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntax: %s Channel TOPICLOCK {ON | OFF}\n"
-"\n"
-"Aktiviert oder deaktiviert die topic lock-Option\n"
-"für den angegebenen Channel.\n"
-"Wenn topic lock eingeschaltet ist, wird %s jede\n"
-"Änderung des Topics verhindern/rückgängig machen,\n"
-"ausser es wurde durch TOPIC eingestellt."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -9074,7 +8980,7 @@ msgstr ""
 "Achtung: Die Berechtigungsstufen für diesen Befehl\n"
 "können variieren!"
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9085,7 +8991,7 @@ msgstr ""
 "Verhindert, das der Bot durch Nicht-IRC Operatoren\n"
 "assigned werden kann."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9101,7 +9007,7 @@ msgstr ""
 "\n"
 "Verfügbare Optionen:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9116,7 +9022,7 @@ msgstr ""
 "Bot gekickt, auch wenn sie nicht das NOKICK-Level\n"
 "haben."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9131,7 +9037,7 @@ msgstr ""
 "User mit voice (+v) vom Bot nicht gekickt, auch \n"
 "wenn sie nicht das NOKICK-Level haben."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9164,7 +9070,7 @@ msgstr ""
 "Kommando ausführen könnte. (Beispiel: Jemand, \n"
 "der kein Op ist, kann auch niemanden mit !op oppen.)"
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9181,7 +9087,7 @@ msgstr ""
 "Msg definiert haben und weiterhin auch die \n"
 "Berechtigung haben, dass diese angezeigt wird."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9196,7 +9102,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9211,7 +9117,7 @@ msgstr ""
 "Option gewählt wird, bereits ein Bot zugewiesen \n"
 "sein, so verfällt die Zuweisung."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9224,7 +9130,7 @@ msgstr ""
 "auf ON gestellt, wird der Channel bei Nichtnutzung\n"
 "nicht auslaufen."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9241,8 +9147,8 @@ msgstr ""
 "die sonst %s übernimmt. \n"
 "(Modechanges, Kicks, Begrüssungsnachrichten usw.)"
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9270,7 +9176,7 @@ msgstr ""
 "Tippe: /msg %s HELP SET Option für weitere Informationen\n"
 "über eine bestimmte Option."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9281,7 +9187,7 @@ msgstr ""
 "Stellt verschiedene Optionen zu deinem Nicknamen ein.\n"
 "Option kann eines der folgenden Werte sein:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9308,7 +9214,7 @@ msgstr ""
 "    IGNORE     Ignore-Modus an oder aus\n"
 "    LIST       Optionen-Liste"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9321,7 +9227,7 @@ msgstr ""
 "erlaubt es ChanServ Dir automatisch Op-Status zu geben,\n"
 "wenn Du die Channels betrittst."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9338,7 +9244,7 @@ msgstr ""
 "des einzelnen Nicks, er wird nur als \"Ursprung\" der \n"
 "Gruppe in der Liste aufgeführt."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9353,7 +9259,7 @@ msgstr ""
 "Informationen über deinen Nicknamen mit dem INFO \n"
 "Befehl anfordert."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9370,7 +9276,7 @@ msgstr ""
 "du hast den nötigen Zugriffslevel in der Access-Liste\n"
 "des Channels. \t"
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9394,7 +9300,7 @@ msgstr ""
 "Der zweite Parameter bestimmt, ob die Information angezeigt\n"
 "werden soll (OFF) oder nicht (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9429,7 +9335,7 @@ msgstr ""
 "Ausserdem ist es möglich, dass die Netz-Admins\n"
 "diese Option deaktiviert haben."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9448,7 +9354,7 @@ msgstr ""
 "Nummer muss von der folgenden Liste der unter-\n"
 "stützten Sprachen ausgewählt werden: "
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9465,7 +9371,7 @@ msgstr ""
 "0 gesetzt, kann dir niemand mehr Memos senden.\n"
 "Du kannst es jedoch auch nicht höher als %d setzen."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9511,7 +9417,7 @@ msgstr ""
 "kann auch nicht die Grenze von %d Memos überschreiten.\n"
 "Der HARD Befehl kann er auch nicht nutzen."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9520,7 +9426,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Zeigt dir eine Liste der verfügbaren Einstellungen von %s"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9536,7 +9442,7 @@ msgstr ""
 "(Queries), ansonsten werden dir die Antworten als Notices\n"
 "geschickt (Standard)."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9555,7 +9461,7 @@ msgstr ""
 "Diese Option ist äquivalent mit der Befehlszeilen-\n"
 "Option -noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9595,7 +9501,7 @@ msgstr ""
 "\n"
 "ON ist eine Kombination aus LOGON und NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9607,7 +9513,7 @@ msgstr ""
 "Ändert das Passwort, mit dem du dich als Besitzer des\n"
 "Nicknamen identifizierst."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9629,7 +9535,7 @@ msgstr ""
 "dem INFO Befehl Informationen über deinen Nicknamen \n"
 "abrufen, unabhängig vom Privat-Modus.)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9660,7 +9566,7 @@ msgstr ""
 "Diese Option ist äquivalent mit der Befehlszeilen-\n"
 "Option -readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9684,7 +9590,7 @@ msgstr ""
 "fehlender Identifizierung den Nicknamen nicht killen\n"
 "(ist von der KILL Option unabhängig)."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9699,7 +9605,7 @@ msgstr ""
 "werden, wenn er wirklich gebraucht wird. Danach sollte er\n"
 "sofort wieder ausgeschaltet werden."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9718,7 +9624,7 @@ msgstr ""
 "* Anmerkung: Dieser Befehl betrifft keine Nicknamen,\n"
 "die nachträglich zu der Gruppe hinzugefügt wurden."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9729,7 +9635,7 @@ msgstr ""
 "Die Services werden durch dieses Befehl normal\n"
 "beendet und die Datenbanken werden gespeichert."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9830,7 +9736,7 @@ msgstr ""
 "SNLINE CLEAR entfernt alle Einträge aus der \n"
 "SNLINE-Liste."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9860,16 +9766,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: SOP Channel ADD Nickname\n"
 "        SOP Channel DEL {Nickname | entry-num | Liste}\n"
@@ -9906,7 +9802,7 @@ msgstr ""
 "/msg %s HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9999,7 +9895,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR löscht alle Einträge der SQLINE Liste."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10009,7 +9905,7 @@ msgstr ""
 "Zeigt alle Nicknamen, die Zugriff auf die Services haben samt Level \n"
 "und Online-Status."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -10020,7 +9916,7 @@ msgstr ""
 "Sendet allen Usern mit Zugriff auf die Services eine Nachricht mit\n"
 "dem Memo-Text."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10067,7 +9963,7 @@ msgstr ""
 "gesetzt, unter anderem die max. Anzahl gleichzeitig\n"
 "verbundenen User."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10092,7 +9988,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR error-message"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10139,7 +10035,7 @@ msgstr ""
 "der Rest wird ignoriert. Wenn kein Nickname angegeben wird,\n"
 "wird dein STATUS angezeigt."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10158,7 +10054,7 @@ msgstr ""
 "\n"
 "Ein Grund kann auf manchen Netzwerke notwendig sein."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10168,7 +10064,7 @@ msgstr ""
 "\n"
 "Erzwingt die Änderung des Nicknamens eines User zu dem neuen Nicknamen."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10263,7 +10159,8 @@ msgstr ""
 "\n"
 "SZLINE CLEAR entfernt alle Einträge aus der SZLINE-Liste."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10286,21 +10183,7 @@ msgstr ""
 "\n"
 "Standardmässig auf Founder (Gründer) beschränkt. "
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: UMODE User Modi\n"
-"\n"
-"Erlaubt es Services Operators die Usermodi eines \n"
-"beliebigen Users zu ändern. Der Paramater hat das gleiche \n"
-"Format wie der normale /MODE Befehl."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10319,7 +10202,7 @@ msgstr ""
 "Channel wieder zugewiesen werden kann, ohne das \n"
 "alle Einstellungen verloren gehen."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10338,7 +10221,7 @@ msgstr ""
 "By default, limited to AOPs or those with level 5 and above\n"
 "on the channel."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10355,7 +10238,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10368,7 +10251,7 @@ msgstr ""
 "wieder frei. Alle vorherigen Einstellungen werden\n"
 "übernommen."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10380,7 +10263,7 @@ msgstr ""
 "Erzwingt die Services, sofort alle Datenbanken auf der\n"
 "Festplatte zu aktualisieren."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10404,7 +10287,7 @@ msgstr ""
 "zusätzlich INVISIBLE angegeben, werden nur User mit dem Flag\n"
 "+i angezeigt."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10427,7 +10310,7 @@ msgstr ""
 "um anderen Voice zu erteilen, oder Level 3 um dich\n"
 "selbst zu voicen."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10456,16 +10339,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: VOP Channel ADD Nickname\n"
 "        VOP Channel DEL {Nickname | entry-num | Liste}\n"
@@ -10495,7 +10368,7 @@ msgstr ""
 "/msg %s HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10511,7 +10384,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10519,7 +10392,7 @@ msgstr ""
 "Syntax: SUSPEND Nickname Grund\n"
 "SUSPEND verhindert das der angegebene Nickname sich identifizieren kann."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10527,7 +10400,7 @@ msgstr ""
 "Syntax: UNSUSPEND Nickname\n"
 "Gibt einen Nicknamen der SUSPENDED ist wieder frei."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10539,51 +10412,97 @@ msgstr ""
 "setzt benötigte Channel-Modes (ModeonID), aktualisiert deinen vHost und\n"
 "deine userflags (lastseentime, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC Channel [Topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr ""
+"    CLEAR      Entfernt bestimmte Einstellungen des angegebenen Channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr "    NOOP          Alle O:Lines temporär deaktivieren"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN      Datenbanken speichern und Services beenden"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr ""
+"    QUIT          Services _ohne_ Speichern der Datenbanken\n"
+"                  beenden"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "Die IMMED Option ist in diesem Netzwerk nicht verfügbar."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Die AKILL-Liste wurde geleert."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Das Defcon-Level ist jetzt auf Level: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "Die Emailadresse %s wird jetzt bei %s INFO Abrufen versteckt."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "Die Emailadresse %s wird jetzt bei %s INFO Abrufen angezeigt."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "Die SNLINE-Liste wurde geleert."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "Die SQLINE-Liste wurde geleert."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "Die SZLINE-Liste wurde geleert."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Der Channel %s hat keinen Schlüßel."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10595,37 +10514,37 @@ msgstr ""
 "AUTODEOP und NOJOIN Maximum-Levels sind, alle anderen\n"
 "hingegegen sind Minimum-Level."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Der Host %s hat momentan %d Verbindungen und ein Limit von %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 "Die letzte Memo die du zu %s gesendet hast (gesendet am %s) wurde gelesen."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Die letzte Memo die du zu %s gesendet hast (gesendet am %s) wurde nicht "
 "gelesen."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Die letzte Quit-Nachricht von %s wird jetzt bei %s INFO Abrufen versteckt."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Die letzte Quit-Nachricht von %s wird jetzt bei %s INFO Abrufen angezeigt."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -10633,7 +10552,7 @@ msgstr ""
 "Die letzte bekannte user@host Maske von %s wird jetzt bei %s INFO Abrufen "
 "versteckt."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -10641,34 +10560,22 @@ msgstr ""
 "Die letzte bekannte user@host Maske von %s wird jetzt bei %s INFO Abrufen "
 "angezeigt."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Du hast keine Berechtigung das Memo-Limit für %s zu ändern."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr ""
-"Der für %s angezeigte Ursprung muss ein Nickname aus der zugehörigen Gruppe "
-"sein!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Der neue \"Anführer\" deiner Gruppe ist jetzt %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Der Nickname %s wird jetzt zu %s geändert."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -10676,19 +10583,19 @@ msgstr ""
 "Die Services-Zugriffsberechtigungen von %s werden jetzt bei %s INFO Abrufen "
 "versteckt."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Die Services-Zugriffsberechtigungen von %s werden jetzt bei %s INFO Abrufen "
 "angezeigt."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Es gibt %d benachrichtigungen für den Channel %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10696,7 +10603,8 @@ msgstr ""
 "Es sind derzeit keine Bots verfügbar. Frag einen \n"
 "Services Administrator, ob er einen erstellt."
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10706,20 +10614,12 @@ msgstr ""
 "davon.\n"
 "Tippe /msg %s HELP GLIST und /msg %s HELP DROP für weitere Infos."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Es gibt %d Benachrichtigung für Channel %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Es gibt eine neue Nachricht für Channel %s.\n"
-"Tippe /msg %s READ %s %d um sie zu lesen."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Der Bot von %s wurde entfernt."
@@ -10740,7 +10640,7 @@ msgstr "Keine randomnews vorhanden."
 msgid "There's no email address set for your nick."
 msgstr "Du hast keine zulässige Email Adresse gesetzt."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10757,83 +10657,38 @@ msgstr ""
 "    PRIVATE        Verhindert das Bots von Nicht-IRC Operatoren\n"
 "                   assigned werden können."
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Dieser Channel wurde verboten."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Dieser Channel wurde registriert von %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Dieser Channel wurde auf SUSPENDED gesetzt."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Dieser Channel kann nicht benutzt werden."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Dieser Channel wird nicht auslaufen."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Dieser Nickname wurde bereits angefordert, bitte prüfe deinen Email Account "
-"für das Passwort."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Dieser Nickname benötigt das Email Bestätigungs Passwort vor Abschluß der "
-"Registrierung."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Dieser Nickname gehört schon jemand anderem. Bitte wähle einen anderen.\n"
-"(Sollte dieser Nickname dir gehören, tippe /msg %s IDENTIFY Passwort.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Dieser Nickname ist registriert, du kannst ihn nicht benutzen."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Dieser Nickname ist zur Zeit gesperrt"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Dieser Nickname ist zur Zeit gesperrt, Grund: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Dieser Nickname ist registriert und geschützt.  Wenn es dein Nickname\n"
-"ist, tippe /msg %s IDENTIFY Passwort. Ansonsten wähle bitte\n"
-"einen anderen Nickname."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Dieser Nickname wird nicht auslaufen."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Dieser Nickname kann nicht benutzt werden. Bitte wähle einen anderen."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Dieser Nickname wird nicht auslaufen."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10841,30 +10696,62 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Schaltet das Listen System ein oder aus"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Topic-Sperre"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Topic-Wiederherstellung"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Topic kann nur durch TOPIC geändert werden"
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Topic-Sperre Option für %s ist jetzt ON."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Topic-Sperre Option für %s ist jetzt ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr "Die Topic-Beibehaltung für %s ist jetzt aktiviert (ON)."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Die Topic-Beibehaltung für %s ist jetzt aktiviert (ON)."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Schalte Caps-Lock aus!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
 #, fuzzy
+msgid "Turn nickname security on or off"
+msgstr ""
+"    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
+"                 für deinen Nicknamen"
+
+#: modules/core/ns_set_kill.cpp:21
+#, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL         Stellt Kill-Schutz an oder aus."
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10879,7 +10766,8 @@ msgstr ""
 "    Channel-Nachrichten lesen. Dies kann mit dem\n"
 "    %s LEVELS Befehl geändert werden."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10891,7 +10779,8 @@ msgstr ""
 "\n"
 "Die Befehle sind nur für Services Admins verfügbar."
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10899,7 +10788,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10907,134 +10797,133 @@ msgstr ""
 "Tippe /msg %s HELP Option für weitere Informationen\n"
 "zu einem bestimmten Befehl."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Tippe /msg %s SET EMAIL eMail wenn du deine eMail-Adresse einstellen "
-"willst.\n"
-"Deine Privatsphäre wird respektiert und deine eMail-Adresse ist Dritten "
-"nicht \n"
-"zugänglich."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr ""
 "Tippe /msg %s LIST NEW um eine Auflistung deiner neuen Memos zu erhalten."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Tippe /msg %s READ %d um sie zu lesen."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Tippe /msg %s READ LAST um sie zu lesen."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE Nickname Modi"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Tippe /msg %s SET EMAIL eMail wenn du deine eMail-Adresse einstellen "
+"willst.\n"
+"Deine Privatsphäre wird respektiert und deine eMail-Adresse ist Dritten "
+"nicht \n"
+"zugänglich."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN channel"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN Channel [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND Channel"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND Nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD     Entfernt ein Modul"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Kann Modul %s nicht laden"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Kann Modul %s nicht entfernen"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "    UNASSIGN      Entfernt ein ServicesBot von einen Channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Ubekannte SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Unbekannte SET Option %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Unbekannte STATS Option %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Unbekannter Befehl %s.  \"/msg %s HELP\" für Hilfe."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Unbekanntes Mode-Zeichen: %c wurde ignoriert."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Unbekannte Option %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend den angegebenen Nicknamen"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Unbekannte Option %s.\n"
-"Tippe /msg %s HELP SET für weitere Informationen."
+"    UPDATE     Erneuert dein gegenwärtigen Status ( Memos , Flags , vHost )"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Datenbanken wurden aktualisiert."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink-Fähigkeiten: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink Server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "User              : %6d Einträge, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"Der User, der mit deinem Nicknamen online gewesen ist, wurde entfernt."
-"Tippe:\n"
-"/msg %s RELEASE %s ein, um ihn vor dem %s-Timeout zurückzubekommen."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "User stimmt mit Channel Exception überein."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11042,16 +10931,35 @@ msgstr ""
 "User-Liste:\n"
 "Nickname                 Maske"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Founder von %s wurde geändert zu %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION       Hosts mit einer bestimmten Anzahl"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Gibt den angegebenen User Voice-Status in einen Channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Voice-Schutz"
 
@@ -11079,16 +10987,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Pass bitte auf was du sagst!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Du bist bereits Mitglied der Gruppe %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Du bist bereits angemeldet."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -11097,11 +11005,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Du bist jetzt kein Super-Admin mehr."
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Dir ist es nicht erlaubt, diesen Channel zu betreten."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Du hast keine Berechtigung dein Memo-Limit zu ändern."
 
@@ -11109,11 +11013,12 @@ msgstr "Du hast keine Berechtigung dein Memo-Limit zu ändern."
 msgid "You are now a SuperAdmin"
 msgstr "Du bist jetzt ein Super-Admin."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Du bist jetzt ein IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -11121,45 +11026,46 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Du bist jetzt in der Gruppe %s vertreten."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Das Erhalten von Empfangsbestätigungen ist nur beim Senden\n"
 "einer Memo an andere User möglich."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Du kannst dich doch nicht selber ghosten!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr ""
 "Ausloggen von %s nicht möglich, da es sich um einen Services Administrator "
 "handelt."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Du kannst dich nicht selber recovern!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11169,7 +11075,8 @@ msgstr ""
 "Nutze stattdessen die AOP, SOP und VOP Befehle.\n"
 "Tippe /msg %s HELP Befehl für weitere Informationen."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11180,6 +11087,7 @@ msgstr ""
 "Tippe /msg %s HELP Befehl für weitere Informationen."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11187,56 +11095,66 @@ msgstr ""
 "Du kannst diesen Befehl nicht benutzen. Benutze Stattdessen ACCESS.\n"
 "Tippe /msg %s HELP ACCESS für weitere Informationen."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Du kannst das Memo-Limit für %s nicht höher als %d setzen."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Du kannst dein Memo-Limit nicht höher als %d setzen."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Du kannst in diesem Netzwerk deine eMail-Adresse nicht entfernen."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Du hast insgesamt %d Memos, davon sind %d ungelesen."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Du hast insgesamt %d Memos, davon ist eine ungelesen."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Du hast %d Memos."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Du hast insgesamt %d Memos, alle davon sind ungelesen."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Du hast derzeit eine ungelesene Memo."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Du hast eine neue Memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Du hast keine Memos."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11246,65 +11164,45 @@ msgstr "Du hast %d neue Memos."
 msgid "You have 1 new memo."
 msgstr "Du hast eine neue Memo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Du hast eine neue Nachricht von %s empfangen.\n"
-"Tippe /msg %s READ %d um sie zu lesen."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Dein Ban in %s wurde entfernt."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Du hast kein Limit in der Anzahl deiner Memos."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Du hast keine Memos."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Du hast keine neuen Memos."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Du musst eine zulässige Zahl als Zeit eingeben."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Ein Bot muss dem Channel zugewiesen werden, bevor dieser Befehl "
-"funktioniert.\n"
-"Tippe /msg %s HELP ASSIGN für weitere Informationen."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Du musst Channel-Operator sein um diesen Channel zu registrieren."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Du musst Channel-Operator sein um diesen Channel zu registrieren."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Du musst länger als %d Sekunden verbunden sein, um einen Nicknamen zu "
 "registrieren."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11314,25 +11212,25 @@ msgstr ""
 "NickServ kann dir dann dein Passwort per Mail senden, falls du es\n"
 "vergessen solltest."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Du wirst bei neuen Memos benachrichtigt, wenn du dich identifizierst bzw "
 "wenn sie eintreffen."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Du wirst bei neuen Memos benachrichtigt, wenn du dich identifizierst."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Du wirst bei neuen Memos benachrichtigt, wenn sie eintreffen."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Du wirst ab sofort keine Memos mehr empfangen können."
 
@@ -11340,7 +11238,7 @@ msgstr "Du wirst ab sofort keine Memos mehr empfangen können."
 msgid "You will no longer be informed via email."
 msgstr "Du wirst nicht länger per Email über neue Memos benachrichtigt."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Du wirst nicht benachrichtigt bei neuen Memos."
 
@@ -11348,18 +11246,20 @@ msgstr "Du wirst nicht benachrichtigt bei neuen Memos."
 msgid "You will now be informed about new memos via email."
 msgstr "Du wirst jetzt per Email über neue Memos informiert."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Dein IRCd unterstützt keine vIdents. Falls das inkorrekt sein sollte, melde "
-"das bitte als einen Bug."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Deine Access-Liste ist leer."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Du bist bereits angemeldet."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11375,35 +11275,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Deine Access-Liste ist leer."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail Adresse für %s wurde auf %s geändert."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Alle O:Lines von %s wurden temporär entfernt."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Ignore-Liste ist leer."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Dein Memo-Limit wurde aufgehoben."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Dein Memo-Limit wurde auf %d gesetzt."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Dein Memo-Limit liegt bei %d, und kann nicht geändert werden."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Dein Memo-Limit liegt bei %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Dein Memo-Limit liegt bei 0, du kannst keine Memos empfangen."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11411,63 +11332,58 @@ msgstr ""
 "Dein Memo-Limit liegt bei 0, du kannst keine Memos empfangen. Das Limit kann "
 "von dir nicht verändert werden."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Du wurdest ausgeloggt."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr ""
 "Dein Nickname ist bereits registriert, tippe /msg %s DROP um ihn zu löschen."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Dein Nickname ist nicht registriert."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Die Registrierung deines Nicknamens wurde gelöscht."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Dein Nickname wurde geändert in %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Dein Passcode wurde noch einmal an %s geschickt."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Dein Passwort ist %s - behalte es für spätere Benutzung."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr ""
-"Dein Passwort ist zu lang. Versuche es erneut mit einen kürzeren Passwort."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Dein vHost (%s) ist jetzt aktiviert."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Dein vHost (%s@%s) ist jetzt aktiviert."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11486,94 +11402,95 @@ msgstr "[Oper News - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Random News - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "läuft nicht aus"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "verfällt beim nächstem Datenbank-Update"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "verfällt in %d Tag"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "verfällt in %d Tagen"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "verfällt in %d Stunde, %d Minute"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "verfällt in %d Stunde, %d Minuten"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "verfällt in %d Stunden, %d Minute"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "verfällt in %d Stunden, %d Minuten"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "verfällt in %d Minute"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "verfällt in %d Minuten"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vHost für %s wurde gelöscht."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vHost für %s wurde gesetzt: %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vHost für %s wurde gesetzt: %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vHost für die Gruppe %s wurde gesetzt: %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vHost für die Gruppe %s wurde gesetzt: %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vHost für die Gruppe %s wurden gelöscht."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "xOP Listen-System"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "XOP System für %s ist jetzt ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "XOP System für %s ist jetzt ON."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "XOP System ist nicht verfügbar."
 
@@ -11582,561 +11499,3 @@ msgstr "XOP System ist nicht verfügbar."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {Nickname | Channel} Memo-text"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s wurde der %s AOP-Liste hinzugefügt."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s wurde der %s HOP-Liste hinzugefügt."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s wurde der %s SOP-Liste hinzugefügt."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s wurde der %s VOP-Liste hinzugefügt."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s wurde gelöscht von der %s HOP-Liste."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s wurde von der %s SOP-Liste gelöscht."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s wurde gelöscht von der %s VOP-Liste."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s wurde auf die %s HOP-Liste verschoben."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s wurde auf %s SOP-Liste verschoben."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s wurde auf die %s VOP-Liste verschoben."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s wurde nicht gefunden in der %s HOP-Liste."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s wurde nicht gefunden in der %s SOP-Liste."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s wurde nicht gefunden in der %s VOP-Liste."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Stellt die Sprache ein, in der die Services\n"
-#~ "               dem Nicknamen antworten sollen."
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE      Verhindert das Erscheinen deines Nicknamens \n"
-#~ "                 auf der Liste von /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d Tage"
-
-#~ msgid "%d hours"
-#~ msgstr "%d Stunden"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d Minuten"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d Sekunden"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "Die HOP-Liste von %s ist leer."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "Die SOP-Liste von %s ist leer."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "Die VOP-Liste von %s ist leer."
-
-#~ msgid "1 day"
-#~ msgstr "1 Tag"
-
-#~ msgid "1 hour"
-#~ msgstr "1 Stunde"
-
-#~ msgid "1 minute"
-#~ msgstr "1 Minute"
-
-#~ msgid "1 second"
-#~ msgstr "1 Sekunde"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "CLEAR-Befehl erlaubt"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "HALFOP/DEHALFOP-Befehl erlaubt"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Die %s HOP-Liste wurde geleert."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Die SOP-Liste von %s wurde geleert."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Die VOP-Liste von %s wurde geleert."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d Einträge wurden von der %s HOP-Liste gelöscht."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d Einträge wurden von der %s SOP-Liste gelöscht."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d Einträge wurden von der %s VOP-Liste gelöscht."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 Eintrag wurde von der %s HOP-Liste gelöscht."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 Eintrag wurde von der %s SOP-Liste gelöscht."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 Eintrag wurde von der %s VOP-Liste gelöscht."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "eMail-Adresse wurde entfernt."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP Channel {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Ende der User-Liste."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Begrüssungsnachricht von %s wurde entfernt."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Der Bot ist nicht im Channel %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "Eintrittsnachricht: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Die Access-Liste für %s leer."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Access-Liste von %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Begrüssungsnachricht von %s wurde geändert."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Fantasy mode ist jetzt OFF im %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Begrüssungsnachricht ist jetzt OFF im %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "HOP Liste für %s:\n"
-#~ "  Nummer  Nickname"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Interner Fehler - kann die Anfrage nicht verarbeiten."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Logon News-Eintrag #%d wurde gelöscht."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s ist nicht registriert."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nickname Registrierung (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Nick-Passwort (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Kein # vor dem Channelnamen gefunden."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "No-Bot-Mode ist jetzt OFF im Channel %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Keine passenden Einträge in der %s HOP-Liste."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Keine passenden Einträge in der %s SOP-Liste."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Keine passenden Einträge in der %s VOP-Liste."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Kein solcher Eintrag (#%d) in der %s AOP-Liste."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Kein solcher Eintrag (#%d) in der %s HOP-Liste."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Kein solcher Eintrag (#%d) in der %s SOP-Liste."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Kein solcher Eintrag (#%d) in der %s VOP-Liste."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice Option für %s ist jetzt OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace Option für %s ist jetzt OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Bitte warte %d Sekunden bis du den SEND Befehl wieder benutzen kannst."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Private-Mode des Bots im %s ist jetzt OFF."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private Option für %s ist jetzt OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Der Privat-Modus (PRIVATE) ist für %s jetzt deaktiviert (OFF)."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Schutz des Nicknamens %s ist jetzt deaktiviert (OFF)."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Kill-Schutz ist jetzt ON, ohne Wartezeit."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER Passwort [eMail]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Eingeschränkter Access Option für %s ist jetzt OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "SOP Liste für %s:\n"
-#~ "  Nummer  Nickname"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s ist nicht registriert"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND Channel [Grund]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure Founder Option für %s ist jetzt OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure-Ops Option für %s ist jetzt OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure Option für %s ist jetzt OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt deaktiviert (OFF)."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Services können die Modi nicht ändern. Ist der Server richtig "
-#~ "konfiguriert?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Services laufen seit %d Tag, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Services laufen seit %d Stunde, %d Minute"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Services laufen seit %d Stunde, %d Minuten"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Services laufen seit %d Stunden, %d Minute"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Services laufen seit %d Minute, %d Sekunde"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Services laufen seit %d Minute, %d Sekunden"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Services laufen seit %d Minuten, %d Sekunde"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signierte kicks Option für %s ist jetzt OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Die Channel HOP-Liste kann derzeit nicht geändert werden."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Die Channel SOP-Liste kann derzeit nicht geändert werden."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Die Channel VOP-Liste kann derzeit nicht geändert werden."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Du kannst maximal %d AOP/SOP/VOP Einträge in einem Channel haben."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Symbiosis-Mode ist jetzt OFF im %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Syntax: RANDOMNEWS ADD Text"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR Channel was"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Syntax: OPERNEWS ADD Text"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Syntax: SET DEBUG {ON | OFF | Nummer}\n"
-#~ "\n"
-#~ "Schaltet den Debug-Modus an oder aus. Wird der aktiviert,\n"
-#~ "werden alle Daten von/an die Services gesendet werden\n"
-#~ "(und ein paar anderen Debug-Meldungen) in ein Logfile\n"
-#~ "geschrieben. Wird Nummer angegeben, wird der Debugging\n"
-#~ "Level auf Nummer gesetzt.\n"
-#~ "\n"
-#~ "Diese Option ist äquivalent mit der Befehlszeilen-\n"
-#~ "Option -debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Syntax: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Begrüssungsnachricht %s wurde entfernt."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "Modul KANN NICHT entfernt werden."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic-Sperre Option für %s ist jetzt OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Die Topic-Beibehaltung für %s ist jetzt deaktiviert (OFF)."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Unbekannter Befehl %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Unbekannte Option %s.\n"
-#~ "Tippe /msg %s HELP KICK für weitere Informationen."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "User %s wurde nicht in der NickServ Datenbank gefunden."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "VOP Liste für %s:\n"
-#~ "  Nummer  Nickname"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Bot %s wurde gelöscht."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] Die Memo die du zum %s gesendet hast wurde angesehen."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Die letzte Memo an %s wurde widerrufen."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Dein vHost (%s) ist jetzt aktiviert."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Bot %s wurde gelöscht."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "XOP System für %s ist jetzt OFF."
diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po
index 14dbdc440..8df8e77c3 100644
--- a/language/anope.el_GR.po
+++ b/language/anope.el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:34-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Greek\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s Changed the DEFCON level to %d"
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "Ï/ç %s ğñïóèİèçêå óôï access list ôïõ %s ìå level %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí autokick ëßóôá ôïõ %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s ğñïóèİèçêå óôçí ëßóôá ôùí êáêşí ëİîåùí ôïõ %s."
+
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s ğñïóèİèçêå óôçí ëßóôá AKILL."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s ğñïóèİèçêå óôçí ëßóôá SNLINE."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s ğñïóèİèçêå óôçí ëßóôá SQLINE."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s ğñïóèİèçêå óôçí ëßóôá SZLINE."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "Ãéá ğåñéóóüôåñåò ğëçñïöïñßåò óå ìéá óõãêåêñéìİíç åíôïëŞ,ãñÜøôå\n"
 "/msg %s HELP ^_command^_."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "Ï %s óïõ åğéôñİğåé íá İ÷åéò bot óôï äéêü óïõ êáíÜëé.\n"
 "ÁõôŞ ç õğçñåóéá İ÷åé äçìéïõñãçèåß ãéá ôïõò ÷ñŞóôåò ğïõ äåí ìğïñïıí\n"
@@ -55,8 +113,8 @@ msgstr ""
 "åíôïëİò ãñÜøôå /msg %s HELP command. \n"
 "    "
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -76,125 +134,56 @@ msgstr ""
 "óõãêåêñéìİíç åíôïëŞ, ğëçêôñïëïãŞóôå /msg %s HELP åíôïëŞ.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"Ï %s åßíáé ìéá õğçñåóßá ğïõ åğéôñİğåé óôïõò ÷ñŞóôåò\n"
-"ôïõ IRC íá óôİëíïõí ìéêñÜ ãñáğôÜ ìçíıìáôá óå Üëëïõò ÷ñŞóôåò\n"
-"ôïõ äéêôıïõ (åßôå âñßóêïíôáé óõíäåäåìİíïé åêåßíç ôç óôéãìŞ,\n"
-"åßôå ü÷é) Ş óå êáíÜëéá(*).\n"
-"Ôá øåõäşíõìá ôïõ áğïóôïëİá êáé ôïõ ğáñáëŞğôç ğñİğåé íá åßíáé\n"
-"êáôï÷õñùìİíá ãéá íá ÷ñçóéìïğïéçèåß ç õğçñåóßá.\n"
-"\n"
-"Ïé åíôïëİò ôïõ %s åßíáé:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s Changed the DEFCON level to %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "Ï/ç %s ğñïóèİèçêå óôï access list ôïõ %s ìå level %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí autokick ëßóôá ôïõ %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s ğñïóèİèçêå óôçí ëßóôá ôùí êáêşí ëİîåùí ôïõ %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s ğñïóèİèçêå óôçí ëßóôá AKILL."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s ğñïóèİèçêå óôçí ëßóôá SNLINE."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s ğñïóèİèçêå óôçí ëßóôá SQLINE."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s ğñïóèİèçêå óôçí ëßóôá SZLINE."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s İ÷åéò Şäç %s êáêİò ëİîåéò."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "Ï/ç %s õğÜñ÷åé Şäç óôçí autokick ëßóôá ôïõ %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s õğÜñ÷åé Şäç óôçí ëßóôá AKILL."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s õğÜñ÷åé Şäç óôçí ëßóôá SNLINE."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s õğÜñ÷åé Şäç óôçí ëßóôá SQLINE."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s õğÜñ÷åé Şäç óôçí ëßóôá SZLINE."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s äåí ìğïñåß íá ğÜñåé ôüóï ÷ñüíï ôo ban."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s changed your usermodes."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -208,42 +197,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "Ï/ç %s äéáãñÜöçêå åğéôõ÷şò áğü ôçí AOP ëßóôá ôïõ %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s äéáãñÜöôçêå áğü ôï access list ôïõ %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "Ï/ç %s äéáãñÜöôçêå áğü ôçí autokick list ôïõ %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s äéáãñÜöôçêå áğü ôçí ëßóôá ôùí êáêşí ëİîåùí áğï ôï %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá session-limit exception."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá AKILL."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá SNLINE."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá SQLINE."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá SZLINE."
@@ -253,71 +242,81 @@ msgstr "%s äéáãñÜöçêå áğü ôçí ëßóôá SZLINE."
 msgid "%s deleted from your access list."
 msgstr "%s äéáãñÜöôçêå áğü ôçí ëßóôá ğñüóâáóŞò óïõ."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s äéáãñÜöôçêå áğü ôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s äéáãñÜöôçêå áğü ôçí ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s áğåíåñãïğïéŞèçêáí óôï êáíÜëé %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s İ÷åé ğïëëÜ êáôï÷õñùìİíá êáíÜëéá."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"Ï %s åßíáé ìéá õğçñåóßá ğïõ åğéôñİğåé óôïõò ÷ñŞóôåò\n"
+"ôïõ IRC íá óôİëíïõí ìéêñÜ ãñáğôÜ ìçíıìáôá óå Üëëïõò ÷ñŞóôåò\n"
+"ôïõ äéêôıïõ (åßôå âñßóêïíôáé óõíäåäåìİíïé åêåßíç ôç óôéãìŞ,\n"
+"åßôå ü÷é) Ş óå êáíÜëéá(*).\n"
+"Ôá øåõäşíõìá ôïõ áğïóôïëİá êáé ôïõ ğáñáëŞğôç ğñİğåé íá åßíáé\n"
+"êáôï÷õñùìİíá ãéá íá ÷ñçóéìïğïéçèåß ç õğçñåóßá.\n"
+"\n"
+"Ïé åíôïëİò ôïõ %s åßíáé:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s İ÷åé Şäç êáëõöèåß áğü ôïí %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s İãéíå ğñïóèŞêç óôçí ëßóôá ğñüóâáóŞò óïõ."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s äåí åßíáé óùóôüò ban ôığïò."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s äåí åßíáé óùóôü bot Ş êáôï÷õñùìİíï êáíÜëé."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s äåí åßíáé ëáíèáóìİíç äéåıèõíóç."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s äåí åßíáé áõôŞ ôç óôéãìŞ ìİóá óôï êáíÜëé %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s not found on ignore list."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -328,12 +327,12 @@ msgstr "%s moved to %s AOP list."
 msgid "%s not found on %s %s list."
 msgstr "Ï/ç %s äåí âñİèçêå ç èİóç óôçí AOP ëßóôá ôïõ %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Ï/ç %s äåí âñİèçêå óôïõ %s óôçí access list."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "O %s äåí âñİèçêå óôçí autokick list ôïõ %s."
@@ -343,32 +342,32 @@ msgstr "O %s äåí âñİèçêå óôçí autokick list ôïõ %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s äåí âñİèçêå óôç ëßóôá ôùí êáêşí ëİîåùí ôïõ %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá session."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá session-limit exception."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá AKILL."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá SNLINE."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá SQLINE."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s äåí âñİèçêå óôçí ëßóôá SZLINE."
@@ -378,12 +377,17 @@ msgstr "%s äåí âñİèçêå óôçí ëßóôá SZLINE."
 msgid "%s not found on your access list."
 msgstr "%s äåí âñİèçêå óôç ëßóôá ğñüóâáóŞò óïõ."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s äåí âñİèçêå óôç ëßóôá ğñüóâáóŞò óïõ."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s äéáãñÜöôçêå áğü ôçí ëßóôá ğñüóâáóŞò óïõ."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -407,18 +411,12 @@ msgstr "%s will now be ignored for %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Óçìåßùóç: ¼ëåò ïé åíôïëİò óôİëíïíôáé óôïí %s êáé êáôáãñÜöïíôáé!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Óçìåßùóç: Ïé õğçñåóßåò åßíáé ìüíï áíáãíşóéìåò; ïé üğïéåò áëëáãİò İãéíáí èá "
-"÷áèïıí!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -426,11 +424,12 @@ msgstr ""
 "Õğåíèıìéóç: Ïé ìÜóêåò ôùí AKILL äåí ğñİğåé íá ğåñéİ÷ïõí øåõäşíõìá; "
 "óéãïõñİøïõ ïôé äåí ğåñéİ÷åéò øåõäşíõìï óôçí ìÜóêá."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Õğåíèıìéóç: ìğïñåßò ìüíï íá ğñïóèİóåéò IP ìÜóêåò óôçí ëßóôá SZLINE."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -482,22 +481,22 @@ msgstr "[auto-memo] The memo you sent has been viewed."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER ^_êùäéêü^_ ^_email^_"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER ^_êùäéêü^_ ^_email^_"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP ^_óôü÷ïò^_ ^_êùäéêü^_"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -515,7 +514,7 @@ msgstr ""
 "åíİñãåéåò.  Ç êáôÜ÷ñçóç ôïõ %s èá ïäçãŞóåé, ôïõëÜ÷éóôïí,\n"
 "óå áğşëåéá ôùí áíÜëïãùí øåõäùíıìùí."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -528,7 +527,8 @@ msgstr ""
 "åíôïëŞ áíáãíşñéóçò ìİóù êùäéêïı, ìğïñïıí íá äïıí ôçí access, AKICK,\n"
 "êáé ôá level ïğïéïõäŞğïôå êáíáëéïı."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -541,1015 +541,344 @@ msgstr ""
 "ìğïñïıí íá\n"
 "äïõí ôçí  ëßóôá access  ãéá êÜèå øåõäşíõìï (/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "            Åğéëïãİò : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "            vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            vhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "            ¼íïìá ôïõ Bot : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           ¼íïìá ôïõ bot : äåí õğÜñ÷åé ãéá ôçí şñá."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "          Åğéëïãİò: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 "        Êåöáëáßá ãñÜììáôá ìå kick : %s (%d kick(s) to ban; minimum %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s (minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "        ÊáíáëÜñ÷çò: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Ôığïò Ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "       ¸íôïíç ÷áñáêôŞñåò ìå kick : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "       ¸íôïíç ÷áñáêôŞñåò ìå kick : %s (%d kick(s) to ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       ÅğáíÜëçøç ìå kick : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       ÅğáíÜëçøç ìå kick : %s (%d kick(s) to ban; %d lines in %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       ÅğáíÜëçøç ìå kick : %s (%d lines in %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       ÌÜóêá : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      ×ñşìáôá ìå kick : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      ×ñşìáôá ìå kick : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "       Ôığïò Ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "      Ôåëåõôáßá ÷ñŞóç: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      Åğéëïãİò êëåéäşìáôïò: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "      ÅğáíÜëçøç ìå kick : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "      ÅğáíÜëçøç ìå kick : %s (%d kick(s) to ban; %d times)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "      ÅğáíÜëçøç ìå kick : %s (%d times)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "      ÕğïêáíáëÜñ÷çò: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "        Êåöáëáßá ãñÜììáôá ìå kick : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "       ¸íôïíç ÷áñáêôŞñåò ìå kick : %s (%d kick(s) to ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "       Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "       Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "     Ôåëåõôáßï topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "     Êáôï÷õñşèçêå: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (áğåíåñãïğïéçìİíï)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (êáíáëÜñ÷çò ìüíï)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìİíùí äéåõèıíóåùí"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìİíùí ÷ñçóôşí"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áğüññéøçò"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áğüññéøçò"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Ğñïóèİôåé ip êëğ óôçí ëßóôá AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        ÁëëÜæåé ôçí ëßóôá ôùí AOP ÷ñçóôşí"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             ÆçôÜôå áğü ôï bot íá İñèåé óôï êáíÜëé óáò"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           ÁëëÜæåôå ôçí ëßóôá êáêşí ëİîåùí"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       ÁëëÜæåé ôïí ôığï ôïõ ban ğïõ èá êÜíïõí ôá Services"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                ÁëëÜæåé ôçí ëßóôá ôùí bot ôïõ äéêôıïõ"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Ëßóôá ìå äéáèİóéìá bots"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Áêõñşíåé ôï ôåëåõôáßï ìŞíõìá ğïõ óôİëíåôå"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL all users on a specific channel"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Åìöáíßæåé üëá ôá êáíÜëéá"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Checks if last memo to a nick was read"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "    ÄçìéïõñãŞèçêå : %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulate the DefCon system"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Delete the vhost of another user"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    ÄéáãñÜöåé İíá Ş ğïëëÜ ìçíıìáôá"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Delete the vhost for all nicks in a group"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          ÁëëÜæåé ôçí ğåñéãñáöŞ ôïõ êáíáëéïı"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    ÁëëÜæåé ôçí ëßóôá ôùí ïìÜäùí"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Áêõñşíåé ôçí êáôï÷ıñùóç åíüò êáíáëéïı"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       ÄéáãñÜöåé İíá øåõäşíõìï"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "    ĞåñéãñáöŞ: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Óõó÷åôßæåé ìßá äéåıèõíóç e-mail ìå ôï øåõäşíõìü óáò"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   ÁëëÜæåéò ôçí ëßóôá ôïõ session-limit exception"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr ""
-"    FORBID     Êáôáóôİëåé ôï êáíÜëé,äåí ìğïñåß íá ôï ÷ñçóéìïğïéŞóç êáíåßò"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr ""
-"    FORBID     Êáôáóôİëåé İíá øåõäşíõìï,äçë ôï êÜíåé íá ìçí ôï ÷ñçóéìïğïéåß\n"
-"               êáíåßò,üğïéïò ôï ğÜñåé İ÷åé kill"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       ÁëëÜæåé ôïí founder ôïõ êáíáëéïı"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Åìöáíßæåé ôïí êùäéêü ãéá ôï óõãêåêñéìİíï øåõäşíõìï\n"
-"               (ìüíï áí ç êùäéêïğïßçóç åßíáé áíåíåñãŞ)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Óôİëíåé ìŞíõìá óå üëïõò ôïõò ÷ñŞóôåò"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Óõó÷åôßæåé İíá ìŞíõìá ÷áéñåôéóìïı ìå ôï øåõäşíõìü óáò"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Syncs the vhost for all nicks in a group"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Ìğİíåôå óå ïìÜäá øåõäşíõìïõ"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "    ÌŞíõìá ÷áéñåôéóìïı: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr ""
-"    HIDE       Áğïêñığôåé óõãêåêñéìİíá ôìŞìáôá ğëçñïöïñéşí ôïõ øåõäùíıìïõ"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Óáò áíáãíùñßæåé ìå ôç ÷ñŞóç êùäéêïı"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Displays information about your memos"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Jupiter\" óå server"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Íá áëëÜæåé ôï topic üôáí äåí ÷ñçóéìïğïéåßôáé ôï êáíÜëé"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Ñõèìßæåôáé  ôé íá êÜíåé óôïõò \"Üôáêôïõò ÷ñŞóôåò\""
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Áğïìáêñıíåé ôï ÷ñŞóôç áğü ôï êáíÜëé"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Åíåñãïğïéåß/áğåíåñãïğïéåß ôçí ğñïóôáóßá ìå áğïóıíäåóç"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   ÁëëÜæåé ôç ãëşóóá ğïõ ÷ñçóéìïğïéïıí ïé\n"
-"                   õğçñåóßåò üôáí ôéò ÷ñçóéìïğïéåßôå"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Åğáíáêáèïñßæåé ôï íüçìá ôùí åğéğİäùí ğñüóâáóçò"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Displays one or more vhost entries."
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Åìöáíßæåé ëßóôá ìå ôá ìçíıìáôá óáò"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   ÁëëÜæåéò ôá ìçíıìáôá ğïõ èá åìöáíßæïíôáé üôáí áõôïß èá "
-"ìğİíïõí\n"
-"        óôï äßêôõï"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        ÁëëÜæåé modes óå êáíÜëé êáé Üëëá"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Êáèáñßæåé ôá modes áğü ôï êáíÜëé"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Info about a loaded module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     List loaded modules"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Un-Load a module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        ÁëëÜæåé ôçí ìİèïäï åğéêïéíùíßáò ìå ôéò õğçñåóßåò"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Áöáéñåß ğñïóùñéíÜ üëåò ôéò O:ãñáììİò áğü ôïí server \n"
-"                    áõôüìáôá"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deactivates your assigned vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Give Operflags to a certain user"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Activates your assigned vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    ÁëëÜæåéò ôá ìçíıìáôá ğïõ èá åìöáíßæïíôáé óôïõò ÷ñŞóôåò ğïõ\n"
-"        ãßíïíôáé oper"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Íá óôİëíåé ìİóá óôï êáíÜëé ìŞíõìá ğïéïò ÷ñçóéìïğïéåß OP/"
-"DEOP \n"
-"         åíôïëİò"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "    Åğéëïãİò : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   ÁëëÜæåé ôïí êùäéêü ôïõ øåõäùíıìïõ óáò"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Íá åëëáôşíåé ôçí ÷ñŞóç \"âßáéùí\" åíôïëşí"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr ""
-"    PRIVATE       Íá ìçí åìöáíßæåôáé ôï êáíÜëé üôáí ãßíåôáé åíôïëŞ LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr ""
-"    QUIT        Ôåñìáôßæåé ôï ğñüãñáììá ôùí Services ÷ùñßò íá óşóåé ôéò "
-"áëëáãİò"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  ÁëëÜæåéò ôá ôõ÷áßá åğéëåãüìåíá ìçíıìáôá ğïõ èá "
-"åìöáíßæïíôáé \n"
-"                    üôáí áõôïß èá ìğİíïõí óôï äßêôõï"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   ÄéáâÜæåé İíá Ş ğïëëÜ ìçíıìáôá"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr ""
-"    RECOVER    Áğïóıíäåóç åíüò Üëëïõ ÷ñŞóôç ğïõ İ÷åé ğÜñåé ôï øåõäşíõìü óáò"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Êáôï÷õñşíåé İíá øåõäşíõìï"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Êáôï÷õñşíåé İíá øåõäşíõìï"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE    ÁíÜêôçóç ôçò êáôáêñÜôçóçò ôïõ øåõäùíıìïõ,ìåôÜ áğü RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Îáíáöïñôşíåé ôï services' configuration áñ÷åßï"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Óşæåé ôéò âÜóåéò äåäïìİíùí êáé åğáíåêêéíåß ôá Services"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr ""
-"    RESTRICTED    Áğáãüñåõóç åéóüäïõ óôï êáíÜëé áí äåí İ÷åéò access åêåß"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Sends a memo and requests a read receipt"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Áíôéèåôïò ìå kick : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Áíôéèåôïò kick : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Åíåñãïğïßçóç ôïõ %s ,ìåëëïíôéêŞ áóöÜëåéá"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Åíåñãïğïéåß/áğåíåñãïğïéåß ôç ëåéôïõñãßá áóöÜëåéáò"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER ÁóöÜëåéá ôïõ founder áğü ôï êáíÜëé"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Ìüíï üóïé İ÷ïõí access èá İ÷ïõí op"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Óôİëíåé İíá ìŞíõìá óå İíá øåõäşíõìï Ş İíá êáíÜëé"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Send a memo to all registered users"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr ""
-"    SENDPASS   Îİ÷áóåò ôïí êùäéêü? Äïêßìáóå áõôü êáé èá óôï óôåßëïõìå åìåßò"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Âëİğåéò ôçí ëßóôá ìå ôá host sessions"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                ÁëëÜæåôå ôéò åğéëïãİò ôïõ bot"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Set the vhost of another user"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Ñõèìßæåéò äéÜöïñåò åğéëïãİò ôùí Services"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr ""
-"    SET        Ñõèìßæåé ôéò åğéëïãİò êáé ôéò ğëçñïöïñßåò\n"
-"               ôïõ êáíáëéïı\t"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr ""
-"    SET        ÁëëáãŞ åğéëïãşí, óõìğåñéëáìâÜíåôáé ç ğñïóôáóßá ìå áğïóıíäåóç"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    ÁëëÜæåé ôéò åğéëïãİò ôùí ìçíõìÜôùí"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Set the vhost for all nicks in a group"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr ""
-"    SHUTDOWN    Ôåñìáôßæåé ôï ğñüãñáììá ôùí Services ìå ôáõôü÷ñïíï ãñÜøéìï "
-"ôùí\n"
-"        áëëáãşí"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Åìöáí. kicks ôá ïğïßá ãßíïíôáé ìå ôçí åíôïëŞ KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Ğñïóèİôåé ip óôçí ëßóôá SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        ÁëëÜæåé ôçí ëßóôá ôùí SOP ÷ñçóôşí"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Ğñïóèİôåé ip óôçí ëßóôá SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Display Services staff and online status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF  Send a memo to all opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr ""
-"    STATS       Äåß÷íåé óôáôéóôéêÜ ó÷åôéêÜ ìå ôá Services êáé ôï äßêôõï"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Åğéóôñİöåé ôçí óõãêåêñéìİíç access level ôïõ ÷ñŞóôç óôï\n"
-"               êáíÜëé"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     ÁëëÜæåé ôïí successor ôïõ êáíáëéïı"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forcefully change a user's nickname"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Ğñïóèİôåé ip óôçí ëßóôá SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Ôï Topic ìğïñåß íá áëëÜîåé ìå ôçí åíôïëŞ TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Change a user's modes"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Releases a suspended channel"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Åíåñãïıí ôá Services (âÜóåéò äåäïìİíùí) ãéá\n"
-"                    íá ãßíïõí update óôï äßóêï áìİóùò"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Åìöáíßæåé üëïõò ôïõò ÷ñŞóôåò"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    ×ñçóéìïğïéåßôáé óôï/á : %d êáíÜëé/á"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr ""
-"    XOP           Áí åßíáé ON äïõëåıåé ìå AOP/SOP,áí åßíáé off ìå access"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Êáêİò ëİîåéò şóôå íá êÜíåé kick : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Êáêİò ëİîåéò şóôå íá êÜíåé kick : %s (%d kick(s) to ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "   E-mail äéåıèõíóç: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "  Åßíáé óôï äßêôõï áğü: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "   Ôåëåõôáßá öïñÜ ğïõ Şôáí óôï äßêôõï: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Ôï Topic ãñÜöôçêå áğü ôïí: %s"
@@ -1559,20 +888,6 @@ msgstr "   Ôï Topic ãñÜöôçêå áğü ôïí: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1583,26 +898,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1612,99 +918,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Ğñáãìáôéêü üíïìá : %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "  ÊáôÜóôáóç êáôï÷ıñùóçò ìå ôçí çìåñïìçíßá: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  ÕğïãñÜììéóç ìå kick : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  ÕğïãñÜììéóç ìå kick : %s (%d kick(s) to ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Íïıìåñï  Áğïóôïëİáò            Çìåñïìçíßá/¿ñá"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Jupiter\" óå server"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (áğü %s óôï %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1723,17 +1012,12 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Ïé åíôïëİò ôïõ %s åßíáé::"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s äåí èá ğáñáôçñçèåß ãéá íİá ìçíıìáôá."
@@ -1743,34 +1027,34 @@ msgstr "%s äåí èá ğáñáôçñçèåß ãéá íİá ìçíıìáôá."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (áğü %s óôï %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modules loaded."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots äéáèİóéìá."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d øåõäşíõìá ìİóá óôçí ïìÜäá."
@@ -1781,14 +1065,14 @@ msgstr "%d øåõäşíõìá ìİóá óôçí ïìÜäá."
 msgid "%s %s list is empty."
 msgstr "Ç AOP ëßóôá ôïõ %s åßíáé Üäåéá."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "Ç ëßóôá ôïõ %s access list åßíáé Üäåéá."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "H autokick list ôïõ %s åßíáé Üäåéá."
@@ -1798,7 +1082,7 @@ msgstr "H autokick list ôïõ %s åßíáé Üäåéá."
 msgid "%s bad words list is empty."
 msgstr "Ç ëßïóôá ôùí êáêşí ëİîåùí ôïõ %s åßíáé Üäåéá."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
@@ -1809,49 +1093,47 @@ msgstr ""
 msgid "%s cannot receive memos."
 msgstr "%s äåí ìğïñåßò íá ëÜâåéò Üëëá ìçíıìáôá."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Ïé åíôïëİò ôïõ %s åßíáé::"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr ""
-"%s ç ìÜóêá åßíáé ğïëı ğëáôéÜ; Ğáñáêáëş ÷ñçóéìïğïéŞóôå ìéá ğéï êáèïñéóìİíç "
-"ìÜóêá."
+msgid "%s commands:"
+msgstr "Ïé åíôïëİò ôïõ %s åßíáé::"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s İ÷åéò %d ìçíıìáôá, åê ôùí ïğïßùí %d äåí İ÷ïõí äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s İ÷åéò %d ìçíıìáôá, åê ôùí ïğïßùí 1 äåí İ÷åé äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s İ÷åéò %d ìçíıìáôá."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s İ÷åéò %d ìçíıìáôá; åê ôùí ïğïßùí üëá äåí İ÷ïõí äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s İ÷åéò 1 ìŞíõìá, êáé äåí ôï İ÷åéò äéáâÜóåé áêüìá."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s İ÷åéò 1 ìŞíõìá.."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s äåí İ÷åéò êáíİíá ìŞíõìá."
@@ -1861,47 +1143,27 @@ msgstr "%s äåí İ÷åéò êáíİíá ìŞíõìá."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s İ÷åéò ğïëëÜ ìçíıìáôá êáé äåí ìğïñåßò íá ëÜâåéò Üëëá."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s äåí İ÷åéò üñéï ìçíõìÜôùí."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s äåí İ÷åéò ìçíıìáôá."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "Ï/ç %s äåí İ÷åé êáíİíá íİï ìŞíõìá."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s åßíáé %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "Ï %s åßíáé ãéá ôçí şñá off."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s åßíáé Şóç ìİóá óôï äßêôõï."
@@ -1923,22 +1185,22 @@ msgstr "%s is enable"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s äåí èá ğáñáôçñçèåß ãéá íİá ìçíıìáôá."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s èá ğáñáôçñçèåß ãéá íİá ìçíıìáôá óôï logon êáé üôáí èá öôÜóïõí."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s èá ğáñáôçñçèåß ãéá íİá ìçíıìáôá óôï logon."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s èá ğáñáôçñçèåß üôáí ôá íİá ìçíıìáôá èá öôÜóïõí."
@@ -1957,6 +1219,11 @@ msgstr ""
 "Ç AOP ëßóôá ôïõ %s åßíáé :\n"
 "  Íïıìåñï  Øåõäşíõìï"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1997,63 +1264,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) ğñïóèİèçêå óôïõ bot ôçí ëßóôá."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's üñéï ìçíõìÜôùí åßíáé %d, êáé äåí ìğïñåß íá áëëá÷ôåß."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Ôïõ/ôçò %s's ôï üñéï ìçíõìÜôùí åßíáé %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<Üãíùóôï>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
@@ -2066,38 +1336,29 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "A vhost ident must be in the format of a valid ident"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [nick [level] | entry-list]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT channel text"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
@@ -2111,17 +1372,22 @@ msgstr ""
 "AKICK channel {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-or-usermask] [reason]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "Ç AKICK ENFORCE ãéá ôïí %s ïëïêëçñşèçêå; %d ÷ñŞóôåò èá åğéññåáóôïıí."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL all users on a specific channel"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "Ç ëßóôá AKILL åßíáé Üäåéá."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2130,44 +1396,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN chan nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Äåí İ÷åéò ôçí åğéôñåğüìåíç Üäåéá."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Ç Access level ãéá ôïí %s óôï %s Üëëáîå óå %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Ç Access level ôïõ %s óôï %s äåí áëëÜæåé áğü ôïí %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr ""
-"Ç Access level ğñİğåé íá åßíáé áíÜìåóá óôï %d êáé %d óõìğáñáëáìâáíüìåíïõ."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Ç Access level äåí ğñİğåé íá åßíáé ğïôİ óôï ìçäİí."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Ï âáèìüò access ãéá ôï êáíÜëé %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Ï âáèìüò Access ãéá ôï %s óâŞóôçêå óôï áñ÷éêü."
@@ -2182,20 +1438,11 @@ msgstr "Access list for %s is empty."
 msgid "Access list for %s:"
 msgstr "Ëßóôá ğñüóâáóçò ãéá %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Ç access ëßóôá ôïõ %s åßíáé:\n"
-"  Íïıíåñï   Âáèìüò  Øåõäşíõìï"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Ëßóôá ğñüóâáóçò:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2204,6 +1451,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Åíåñãïğïßçóç ôïõ %s ,ìåëëïíôéêŞ áóöÜëåéá"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Activates your assigned vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2224,7 +1481,7 @@ msgstr "Ğñïóèİèçêå İíá íİï ìŞíõìá ãéá ôïõò opers èİóç (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Ğñïóèİèçêå İíá íİï ìŞíõìá óôçí èİóç (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2237,22 +1494,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "¼ëåò ïé O:ãñáììİò ôïõ %s İ÷ïõí áğïìáêñõíèåß."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "¼ëåò ïé O:ãñáììİò ôïõ %s İ÷ïõí óâçóôåß."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
@@ -2261,12 +1518,12 @@ msgstr "All vhost's in the group %s have been set to %s"
 msgid "All logon news items deleted."
 msgstr "¼ëïé ïé êáíïíéóìïß Ş ïé ğëçñïöïñßåò äéáãñÜöçêáí."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "¼ëá ôá ìçíıìáôá äéáãñÜöçêáí."
 
@@ -2278,22 +1535,22 @@ msgstr "¼ëá ôá íİá ãéá ôïõò opers äéáãñÜöçêáí."
 msgid "All random news items deleted."
 msgstr "¼ëá ôá ìçíıìáôá äéáãñÜöçêáí."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "¼ëïé ïé ÷ñŞóôåò İãéíáí kick áğü ôï êáíÜëé %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
@@ -2417,12 +1674,34 @@ msgstr "Åğéôñİğåôáé íá ÷ñçóéìïğïéŞóåéò fantaisist åíôïëİò"
 msgid "Allowed to view the access list"
 msgstr "Åğéôñİğåôáé íá âëİğåôáé ôçí ëßóôá ğñüóâáóçò"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             ÆçôÜôå áğü ôï bot íá İñèåé óôï êáíÜëé óáò"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Óõó÷åôßæåé İíá ìŞíõìá ÷áéñåôéóìïı ìå ôï øåõäşíõìü óáò"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Óõó÷åôßæåé ìßá äéåıèõíóç e-mail ìå ôï øåõäşíõìü óáò"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Ç Autokick list ôïõ %s åßíáé:"
@@ -2447,17 +1726,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Ôï êáíÜëé äßíåé öùíŞ Ş +v óå êáôï÷õñùìİíá Ş ìç øåõäşíõìá"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2476,26 +1755,26 @@ msgstr ""
 "Ç ëßóôá ìå ôéò êáêİò ëİîåéò ôïõ %s åßíáé:\n"
 "  Íïıì   Ëİîç                           Ôığïò"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Ç ëßóôá ôùí êáêşí ëİîåùí åßíáé Üäåéá."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban ôığïò ôïõ êáíáëéïı %s åßíáé ôşñá #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s õğÜñ÷åé Şäç."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Ôï Bot %s äåí õğÜñ÷åé."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Ôï Bot %s èá ìğåé óôï %s."
@@ -2510,27 +1789,27 @@ msgstr "Bot %s Üëëáîå óå %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Bot %s äéáãñÜöçêå."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Ôï Bot èá êÜíåé kick ôïõò ops ôïõ êáíáëéïı %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Ôï Bot èá êÜíåé kick ôïõò voices ôïõ êáíáëéïı %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Ôï Bot äåí èá êÜíåé kick ôïõå ops ôïõ êáíáëéïı %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Ôï Bot äåí èá êÜíåé kick ôïõò voices ôïõ êáíáëéïı %s."
@@ -2560,16 +1839,11 @@ msgstr "Bot Idents may only contain valid characters."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Ôï Bot äåí åßíáé óôï êáíÜëé %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Bot ëßóôá:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2578,7 +1852,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2589,7 +1863,7 @@ msgstr ""
 "%d kicks ãéá ôïí ßäéï ÷ñŞóôç. ×ñçóéìïğïßçóå ôçí BADWORDS åíôïëŞ\n"
 "ãéá íá ğñïóèİóåéò Ş íá áöáéñİóåéò êáêİò ëİîåéò."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2598,7 +1872,7 @@ msgstr ""
 "åíôïëŞ\n"
 "ãéá íá ğñïóèİóåéò Ş íá áöáéñİóåéò êáêİò ëİîåéò."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2607,11 +1881,11 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick İíôïíïõò ÷áñáêôŞñåò, êáé èá êÜíåé ban ìåôÜ  áğü \n"
 "%d kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Ôï Bot èá êÜíåé ôşñá kick İíôïíïõò ÷áñáêôŞñåò."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2622,7 +1896,7 @@ msgstr ""
 "%d ÷áñáêôŞñåò êáé %d%% áğü ôï ìŞíõìá), êáé èá \n"
 "ãßíåé ban ìåôÜ áğü %d kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2631,7 +1905,7 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick êåöáëáßá (ğñİğåé íá åßíáé ôïõëÜ÷éóôïí\n"
 "%d ÷áñáêôŞñåò êáé %d%% áğü ôï ìŞíõìá)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2640,11 +1914,11 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá ÷ñşìáôá, êáé èá êÜíåé ban ìåôÜ áğü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Ôï Bot èá êÜíåé kick ãéá ÷ñşìáôá."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2653,12 +1927,12 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá åğáíáëŞøåéò (%d ãñáììİò óå %d äåõôåñüëåğôá), êáé \n"
 "èá êÜíåé ban ìåôÜ áğü %d kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Ôï Bot èá êÜíåé kick ãéá åğáíáëŞøåéò (%d ãñáììİò óå %d äåõôåñüëåğôá)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2667,11 +1941,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2682,7 +1956,7 @@ msgstr ""
 "ôï ßäéï ğñÜãìá), êáé èá ãßíåôáé ban ìåôÜ áğü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2691,7 +1965,7 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá åğáíáëŞøåéò (÷ñŞóôåò ğïõ ëİíå %d öïñİò\n"
 "ôï ßäéï ğñÜãìá)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2700,11 +1974,11 @@ msgstr ""
 "Ôï Bot èá êÜíåé kick ãéá reverses, êáé èá êÜíåé ban ìåôÜ áğü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Ôï Bot èá êÜíåé kick ãéá reserves."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2714,16 +1988,16 @@ msgstr ""
 "áğü %d \n"
 "kicks ãéá ôïí ßäéï ÷ñŞóôç."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Ôï Bot èá êÜíåé kick ãéá õğïãñáììéóìİíïõò ÷áñáêôŞñåò."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Ôï Bot èá êÜíåé kick ãéá ÷ñşìáôá."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2732,184 +2006,209 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick êáêİò ëİîåéò ğëİïí."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick İíôïíïõò ÷áñáêôŞñåò ğëİïí."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick êåöáëáßá ğëİïí."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá ÷ñşìáôá ğëİïí."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá åğáíáëŞøåéò ğëİïí."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá åğáíáëŞøåéò ğëİïí."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá reverses ğëİïí."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick ãéá õğïãñáììéóìİíïõò ÷áñáêôŞñåò ğëİïí."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Ôï Bot äåí èá êÜíåé kick êåöáëáßá ğëİïí."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d âÜóåéò, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots åßíáé ìüíï ãéá IRC operators:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Äéáâáóìİíá Bytes   : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Ãñáììİíá Bytes : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {øåõäşíõìï | êáíÜëé}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [ğåñéå÷üìåíï|íïıìåñï]\t"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES channel [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR channel what"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Áêõñşíåé ôï ôåëåõôáßï ìŞíõìá ğïõ óôİëíåôå"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Áêõñşíåé ôçí êáôï÷ıñùóç åíüò êáíáëéïı"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       ÄéáãñÜöåé İíá øåõäşíõìï"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Äåí ìğïñåß íá óôáëåß óôç äéåıèõíóç ôï ìŞíõìá ãéá ôçí şñá; ğáñáêáëş "
 "ğñïóğÜèçóå ëßãï áñãüôåñá."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Bot ëßóôá:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Access list for %s is empty."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Ëßóôá ğñüóâáóçò ãéá %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d âÜóåéò, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Changed usermodes of %s."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s changed your usermodes."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Áõôü ôï êáíÜëé %s äåí õğÜñ÷åé."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        ÁëëÜæåé ôçí ìİèïäï åğéêïéíùíßáò ìå ôéò õğçñåóßåò"
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Changed usermodes of %s."
+
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Ôï êáíÜëé %s äéáãñÜöôçêå áğü ôéò õğçñåóßåò."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Áõôü ôï êáíÜëé %s İ÷åé ğáñáêñáôçèåß áğü ôïí %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Ôï êáíÜëé %s åßíáé Şäç êáôï÷õñùìİíï!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Ôï êáíÜëé %s ğáñáêñáôåßôå."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Áõôü ôï êáíÜëé %s äåí İ÷åé êáôï÷õñùèåß."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Áõôü ôï êáíÜëé %s äåí ìğïñåß íá êáôï÷õñùèåß Ş íá ÷ñçóéìïğïéçèåß."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Ôï êáíÜëé %s äåí ìğïñåß íá êáôï÷õñùèåß."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Ôï êáíÜëé %s åßíáé êáôï÷õñùìİíï áğü ôï øåõäşíõìü óïõ: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "ÊáíÜëéá       : %6d âÜóåéò, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Ôï êáíÜëé %s èá ëŞîåé."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Ôï êáíÜëé %s äåí èá ëŞîåé."
@@ -2919,33 +2218,28 @@ msgstr "Ôï êáíÜëé %s äåí èá ëŞîåé."
 msgid "Channel %s %s list has been cleared."
 msgstr "Channel %s AOP list has been cleared."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Channel %s access list has been cleared."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Channel %s akick list has been cleared."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Channel %s is now released."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Ç åíôïëŞ Channel SQLINEs äåí õğïóôçñßæåôáé áğü ôïí IRCd óïõ,ãéáõôï äåí "
 "ìğïñåßò íá ôéò ÷ñçóéìïğïéŞóåéò."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2953,7 +2247,7 @@ msgstr ""
 "Ëßóôá Êáíáëéïı:\n"
 "¼íïìá                 ×ñŞóôåò  Åğéëïãİò   Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2962,7 +2256,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2970,16 +2264,47 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Checks if last memo to a nick was read"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                ÁëëÜæåôå ôéò åğéëïãİò ôïõ bot"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Ñõèìßæåôáé  ôé íá êÜíåé óôïõò \"Üôáêôïõò ÷ñŞóôåò\""
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Êáèáñßæåé ôá modes áğü ôï êáíÜëé"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Ç İùò ôşñá AKILL ëßóôá åßíáé:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2987,15 +2312,15 @@ msgstr ""
 "Ç åùò ôşñá AKILL ëßóôá åßíáé:\n"
 "  Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Current SNLINE list:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3003,11 +2328,11 @@ msgstr ""
 "Ç İùò ôşñá ëßóôá SNLINE åßíáé ïé åîçò:\n"
 "  Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Ç İùò ôşñá ëßóôá SQLINE åßíáé ïé åîŞò:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3015,11 +2340,11 @@ msgstr ""
 "Ç İùò ôşñá ëßóôá SQLINE åßíáé ïé åîŞò:\n"
 " Íïõ   ÌÜóêá                              Ëüãïò"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Ç İùò ôşñá ëßóôá SZLINE åßíáé ïé åîŞò:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3028,7 +2353,7 @@ msgstr ""
 "  Íïõ    ÌÜóêá                              Ëüãïò"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Ç İùò ôşñá ëßóôá Session Limit Exception åßíáé ïé åîŞò:"
 
@@ -3052,56 +2377,61 @@ msgstr "Ùò ôşñá õğÜñ÷ïõí SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Ùò ôşñá õğÜñ÷ïõí SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Ïé ùò ôşñá ÷ñŞóôåò: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [êáíÜëé] {íïõ | list | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP channel"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deactivates your assigned vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3226,6 +2556,49 @@ msgstr "Åîáñ÷Şò ÷ñüíïò ëŞîçò SZLINE: 1 ëåğôü"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Åîáñ÷Şò ÷ñüíïò ëŞîçò SZLINE: Äåí ëŞãåé ğïôİ"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   ÁëëÜæåéò ôá ìçíıìáôá ğïõ èá åìöáíßæïíôáé üôáí áõôïß èá "
+"ìğİíïõí\n"
+"        óôï äßêôõï"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   ÁëëÜæåéò ôá ìçíıìáôá ğïõ èá åìöáíßæïíôáé üôáí áõôïß èá "
+"ìğİíïõí\n"
+"        óôï äßêôõï"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    ÁëëÜæåéò ôá ìçíıìáôá ğïõ èá åìöáíßæïíôáé óôïõò ÷ñŞóôåò ğïõ\n"
+"        ãßíïíôáé oper"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    ÄéáãñÜöåé İíá Ş ğïëëÜ ìçíıìáôá"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Delete the vhost for all nicks in a group"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Delete the vhost of another user"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3236,7 +2609,7 @@ msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí AOP ëßóôá ôïõ %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü %s access list."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí autokick list %s."
@@ -3276,7 +2649,7 @@ msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí ëßóôá SZLINE."
 msgid "Deleted 1 entry from %s access list."
 msgstr "ÄéáãñÜöåé 1 èİóç áğü %s access list."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "ÄéáãñÜöôçêå 1 èİóç áğü ôçí autokick list %s."
@@ -3311,32 +2684,74 @@ msgstr "ÄéáãñÜöçêå 1 èİóç áğü ôçí ëßóôá SZLINE."
 msgid "Deleted one entry from %s %s list."
 msgstr "ÄéáãñÜöçêå 1 èİóç áğü ôçí AOP ëßóôá ôïõ %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "ĞåñéãñáöŞ ôïõ %s Üëëáîå óå %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "áğåíåñãïğïéçìİíï"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Display Services staff and online status"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Displays one or more vhost entries."
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3365,170 +2780,212 @@ msgstr "Ìçí ÷ñçóéìïğïéåßò áõôŞ ôç ëİîç %s óôï êáíÜëé!"
 msgid "Don't use underlines on this channel!"
 msgstr "Ìçí ÷ñçóéìïğïéåßò ÷áñáêôŞñåò õğïãñÜììéóçò óôï êáíÜëé!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Ç äéåıèõíóç ãéá %s åßíáé ëáíèáóìİíç."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "åíåñãïğïéçìİíï"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "End of %s list."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Ôåëïò ôçò ëßóôáò ğñïóâáóçò."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Ôİëïò ëßóôáò êáíáëéïı."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Ôİëïò ôçò ëßóôáò - %d/%d âñİèçêáí êáé åìöáíßóôçêáí."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Ôİëïò ôçò ëßóôáò - %d/%d âñİèçêáí êáé åìöáíßóôçêáí."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Ôİëïò ëßóôáò ÷ñçóôşí."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "ÅëëçíéêÜ"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Îáíáöïñôşíåé ôï services' configuration áñ÷åßï"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Exception ãéá %s (#%d) ìåôáêéíŞèçêå óôç èİóç %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Ôï ÷ñïíéêü üñéï ôïõ/çò %s Üëëáîå"
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID êáíÜëé ëüãïò"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID êáíÜëé [ëüãïò]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname reason"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [reason]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Öáíôáóßá"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "Ç Fantasy åğéëïãŞ åßíáé ôşñá ON óôï êáíÜëé %s."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "Ç Fantasy åğéëïãŞ åßíáé ôşñá ON óôï êáíÜëé %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s will no longer be ignored."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Ç ìÜóêá %s åßíáé Şäç ìİóá óôçí ëßóôá ğñüóâáóçò."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Åíåñãïıí ôá Services (âÜóåéò äåäïìİíùí) ãéá\n"
+"                    íá ãßíïõí update óôï äßóêï áìİóùò"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forcefully change a user's nickname"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr ""
+"    SENDPASS   Îİ÷áóåò ôïí êùäéêü? Äïêßìáóå áõôü êáé èá óôï óôåßëïõìå åìåßò"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Ï Founder ôïõ %s Üëëáîå êáé ğŞãå óôïí %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 "Ç GETPASS åíôïëŞ äåí åßíáé äéáèİóéìç ãéáôß ÷ñçóéìïğïéåßôáé ç êùäéêïğïßçóç."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [password]"
 
@@ -3536,11 +2993,26 @@ msgstr "GHOST nickname [password]"
 msgid "GLOBAL message"
 msgstr "GLOBAL message"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Ôï øåõäşíõìï óïõ İãéíå kill ìİóù ghost åíôïëŞò."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Give Operflags to a certain user"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "×áéñåôéóìüò"
 
@@ -3548,82 +3020,162 @@ msgstr "×áéñåôéóìüò"
 msgid "Greet message displayed"
 msgstr "Ôï ìŞíõìá ÷áéñåôéóìïı íá äéáôõğşíåôáé"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr "Ç åğéëïãŞ ÷áéñåôéóìïı åßíáé ON óôï êáíÜëé %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, fuzzy, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr "Ç åğéëïãŞ ÷áéñåôéóìïı åßíáé ON óôï êáíÜëé %s."
+
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr ""
+"    HIDE       Áğïêñığôåé óõãêåêñéìİíá ôìŞìáôá ğëçñïöïñéşí ôïõ øåõäùíıìïõ"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr ""
+"    PRIVATE       Íá ìçí åìöáíßæåôáé ôï êáíÜëé üôáí ãßíåôáé åíôïëŞ LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts ìå ôï ëéãüôåñï %d sessions:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY ^_êùäéêü^_"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO channel"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {chan | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE êáíÜëé"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Óáò áíáãíùñßæåé ìå ôç ÷ñŞóç êùäéêïı"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Áí äåí áëëÜîåéò ôï øåõäşíõìï áõôü ìİóá óå 20 äåõôåñüëåğôá, èá óôï áëëÜîù "
 "áõôüìáôá åãş."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Áí äåí áëëÜîåéò ôï øåõäşíõìï áõôü ìİóá óå İíá ëåğôü, èá óôï áëëÜîù áõôüìáôá "
 "åãş."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
@@ -3632,12 +3184,13 @@ msgstr "Ignore list has been cleared."
 msgid "Ignore list is empty."
 msgstr "Ç ëßóôá ignore ôùí õğçñåóéşí åßíáé Üäåéá."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Bot ëßóôá:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3653,25 +3206,17 @@ msgstr ""
 "ĞëçêôñïëïãŞóôå /msg %s HELP SET åğéëïãŞ ãéá ğåñéóóüôåñåò ğëçñïöïñßåò\n"
 "óå ìßá óõãêåêñéìİíç åğéëïãŞ."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Info about a loaded module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Ğëçñïöïñßåò ãéá ôï bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Ğëçñïöïñßåò ãéá ôï êáíÜëé %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Ëáíèáóìİíïò ÷ñüíïò ëŞîçò."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3679,13 +3224,11 @@ msgstr ""
 "ËÜèïò hostmask. Ìüíï ğñáãìáôéêÜ hostmasks ÷ñçóéìïğïéïıíôáé êáé ü÷é øåõäşíõìá "
 "Ş usernames."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Invalid passcode has been entered, please check the e-mail again, and retry."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3694,7 +3237,7 @@ msgstr ""
 "ËÜèïò session limit. Ğñİğåé íá åßíáé ëÜèïò ï integer greater Ş ğñİğåé íá "
 "åßíáé ìåôáîı ìçäİí êáé %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "ËÜèïò threshold value. Ğñİğåé íá åßíáé ìåãáëıôåñï áğü ôï 1."
 
@@ -3702,12 +3245,17 @@ msgstr "ËÜèïò threshold value. Ğñİğåé íá åßíáé ìåãáëıôåñï áğü ôï 1."
 msgid "JUPE servername [reason]"
 msgstr "JUPE servername [reason]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Ìğİíåôå óå ïìÜäá øåõäşíõìïõ"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK channel option {ON|OFF} [settings]"
@@ -3716,263 +3264,446 @@ msgstr "KICK channel option {ON|OFF} [settings]"
 msgid "KICK channel user reason"
 msgstr "KICK channel user reason"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Áğïìáêñıíåé ôï ÷ñŞóôç áğü ôï êáíÜëé"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr ""
+"    RECOVER    Áğïóıíäåóç åíüò Üëëïõ ÷ñŞóôç ğïõ İ÷åé ğÜñåé ôï øåõäşíõìü óáò"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST pattern"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [êáíÜëé] [list | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP ^_óôü÷ïò^_ ^_êùäéêü^_"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [ğåñéå÷üìåíï|íïıìåñï]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Ç ãëşóóá Üëëáîå óå ÅëëçíéêÜ."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ôï ôåëåõôáßï ìŞíõìá ğïõ ğŞãáéíå ãéá ôïí %s áêõñşèçêå."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Ôåëåõôáßï áğï÷áéñåôéóôŞñéï ìŞíõìá: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ôåëåõôáßá äéåıèõíóç: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Ï âáèìüò ãéá ôïí %s óôï êáíÜëé %s Üëëîå óå %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Ï âáèìüò ğñİğåé íá åßíáé ìåôáîı %d êáé %d."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "ÁõôŞ ç åíôïëŞ åßíáé ÷ñŞóéìç ãéá áõôŞ ôçí åğéëïãŞ."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Ç ëßóôá ìå ôéò êáôá÷ùñŞóåéò âñİèçêáí %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     List loaded modules"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Ç ëßóôá ìå ôá øåõäşíõìá óôçí ïìÜäá ôïõ %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Ç ëßóôá ìå ôá øåõäşíõìá óôçí ïìÜäá:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Åìöáíßæåé ëßóôá ìå ôá ìçíıìáôá óáò"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Åìöáíßæåé üëá ôá êáíÜëéá"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Ç ëßóôá ìå ôá øåõäşíõìá óôçí ïìÜäá:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Åìöáíßæåé üëïõò ôïõò ÷ñŞóôåò"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Ëßóôá ìå äéáèİóéìá bots"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "ÊáíÜëéá ôïğéêÜ äåí ìğïñïıí íá êáôï÷õñùèïıí."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
+msgstr "Êáíïíéóìüò Ş ğëçñïöïñßá óôç èİóç #%d äéáãñÜöçêå."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Êáíïíéóìüò óôç èİóç #%d äåí âñİèçêå!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Êáíïíéóìïß:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE channel modes"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áğüññéøçò"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           ÁëëÜæåôå ôçí ëßóôá êáêşí ëİîåùí"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                ÁëëÜæåé ôçí ëßóôá ôùí bot ôïõ äéêôıïõ"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Óõíôçñåß ôç ëßóôá áõôüìáôçò áğüññéøçò"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Ğñïóèİôåé ip êëğ óôçí ëßóôá AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulate the DefCon system"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Ğñïóèİôåé ip óôçí ëßóôá SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Ğñïóèİôåé ip óôçí ëßóôá SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Ğñïóèİôåé ip óôçí ëßóôá SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ç ìÜóêá %s åßíáé Şäç ìİóá óôçí ëßóôá ğñüóâáóçò."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Ç ìÜóêá ğñİğåé íá åßíáé ôçò ìïñöŞò user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Matches and returns all users that registered using given "
+"email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Ìİãéóôïé ÷ñŞóôåò: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "ÌŞíõìá %d áğü ôï %s (%s).  Ãéá íá ôï óâŞóåéò, ãñÜøå: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "ÌŞíõìá %d áğü %s (%s).  Ãéá íá ôï óâŞóåéò, ãñÜøå: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "ÌŞíõìá %d äéáãñÜöçêå."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Ôï üñéï ìçíõìÜôùí áğåíåñãïğïéŞèçêå ãéá ôïí %s."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Ôï üñéï ìçíõìÜôùí ãéá ôïí %s Üëëáîå óå %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Ôï üñéï ìçíõìÜôùí ãéá ôïí %s Üëëáîå óå 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr ""
-"Ôï üñéï ìçíõìÜôùí åßíáé ğïëı ìåãÜëï; ïñéïèİôçóİ ôï %d óõìğåñéëáìâáíïìİíïõ."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Ôï ìŞíõìá óôÜëèçêå óôïí %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "ÌŞíõìá ãéá ôïí %s.  Ãéá íá ôï äéáâÜóåéò, ãñÜøå: /msg %s READ num"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Ìçíıìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "ÌŞíõìá ãéá ôïí %s.  Ãéá íá ôï äéáâÜóåéò, ãñÜøå: /msg %s READ num"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Ìçíıìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "ÅğéëïãŞ ìçíıìáôïò"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "      Åğéëïãİò êëåéäşìáôïò: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        ÁëëÜæåé ôçí ëßóôá ôùí AOP ÷ñçóôşí"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        ÁëëÜæåé ôçí ëßóôá ôùí SOP ÷ñçóôşí"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìİíùí äéåõèıíóåùí"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     ÁëëÜæåé ôç ëßóôá ôùí åîïõóéïäïôçìİíùí ÷ñçóôşí"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   ÁëëÜæåéò ôçí ëßóôá ôïõ session-limit exception"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases    : %6d âÜóåéò, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS ÏìÜäåò     : %6d âÜóåéò, %5d kB"
@@ -3985,11 +3716,13 @@ msgstr "Ôá bot's íá ìçí ğåôÜíå İîù ôïõò kickers"
 msgid "New memo"
 msgstr "New memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Íİá ìçíıìáôá ãéá ôïí %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ num"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr ""
 "Íİá ìçíıìáôá ãéá ôï %s.  Ãéá íá ôá äéáâÜóåéò, ãñÜøå: /msg %s READ %s num"
@@ -3998,141 +3731,107 @@ msgstr ""
 msgid "News list is full!"
 msgstr "Ç ëßóôá ôùí íİùí åßíáé ãåìÜôç!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Áõôü ôï øåõäşíõìï %s İ÷åé ğáñáêñáôçèåß áğü ôïí %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Ôï øåõäşíõìï %s óâŞóôçêå åğéôõ÷şò áğü ôçí õğçñåóßá."
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Áõôü ôï øåõäşíõìï %s åßíáé Şäç êáôï÷õñùìİíï!"
+
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Ôï øåõäşíõìï %s áğü ôşñá ğáñáêñáôåßôáé."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Ôï øåõäşíõìï %s äåí êñáôåßôáé.."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Áõôü ôï øåõäşíõìï %s äåí ÷ñçóéìïğïéåßôå áõôŞ ôç óôéãìŞ."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Áõôü ôï øåõäşíõìï %s äåí åßíáé êáôï÷õñùìİíï."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Áõôü ôï øåõäşíõìï %s äåí ìğïñåß íá êáôï÷õñùèåß Ş íá ÷ñçóéìïğïéçèåß."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Ôï øåõäşíõìü óïõ %s äåí êáôİ÷åôáé ãéá ôçí şñá."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is currently suspended."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NOT registered, please try again later."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nickname %s confirmed"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Ôï øåõäşíõìï %s óâŞóôçêå åğéôõ÷şò áğü ôçí õğçñåóßá."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Áõôü ôï øåõäşíõìï %s åßíáé Şäç êáôï÷õñùìİíï!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Áõôü ôï øåõäşíõìï %s äåí ìğïñåß íá êáôï÷õñùèåß."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Áõôü ôï øåõäşíõìï %s êáôï÷õñşèçêå õğü ôçí äéåıèõíóŞ óïõ: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nickname Registration (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4143,26 +3842,36 @@ msgstr ""
 "ôçò áõôüìáôçò ëŞîçò, ğ.ò. èá äéáãñÜöïíôáé áõôüìáôá\n"
 "ìåôÜ áğü %d ìİñåò áí äåí ÷ñçóéìïğïéïıíôáé."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now off on channel %s."
 msgstr "Êáíİíá Bot İ÷åé åğéëïãŞ ON óôï êáíÜëé %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/bs_set.cpp:136
+#, fuzzy, c-format
+msgid "No Bot mode is now on on channel %s."
+msgstr "Êáíİíá Bot İ÷åé åğéëïãŞ ON óôï êáíÜëé %s."
+
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Êáíİíá bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "äåí ëŞãåé ğïôİ"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Äåí õğÜñ÷åé äéáèİóéìç âïŞèåéá ãéá %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
@@ -4177,13 +3886,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí AOP ëßóôá ôïõ %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Äåí âñİèçêáí èİóåéò óôïõ %s óôçí access list."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí autokick list ôïõ %s."
@@ -4194,39 +3903,43 @@ msgstr "Äåí âñİèçêáí èİóåéò óôçí autokick list ôïõ %s."
 msgid "No matching entries on %s bad words list."
 msgstr "Äåí âñİèçêáí ïé èİóåéò óôçí ëßóôá ôùí êáêşí ëİîåùí ôïõ %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí ëßóôá session-limit exception."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí ëßóôá AKILL."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí ëßóôá SNLINE."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí ëßóôá SQLINE."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Äåí âñİèçêáí èİóåéò óôçí ëßóôá SZLINE."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Êáíİíá ìŞíõìá äåí áêõñşèçêå."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Äåí õğÜñ÷ïõí èİóåéò óôçí ëßóôá ãéá íá äéáãñÜøåéò!"
@@ -4235,16 +3948,12 @@ msgstr "Äåí õğÜñ÷ïõí èİóåéò óôçí ëßóôá ãéá íá äéáãñÜøåéò!"
 msgid "No random news items to delete!"
 msgstr "Äåí âñİèçêáí ìçíıìáôá ãéá íá äéáãñáöïıí!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "×ùñßò ëüãïò"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "¼÷é signed kick üôáí ôï SIGNKICK LEVEL ÷ñçóéìïğïéåßôáé"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Êáíİíá"
 
@@ -4252,7 +3961,7 @@ msgstr "Êáíİíá"
 msgid "Not allowed to join channel"
 msgstr "Äåí åğéôñİğåôáé íá ìğåßôå óôï êáíÜëé áí åßíáé RESTRICTED"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4263,28 +3972,28 @@ msgstr ""
 "(äçë êáíİíáò ÷ñŞóôçò ğïõ İ÷åé access äåí ìğİíåé óôï êáíÜëé\n"
 "ãéá åêåßíç ôçí ğåñßïäï ôùí çìåñşí) èá äéáãñáöåß áõôüìáôá."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Íïõ  Limit  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Ğïéïò ÷ñçóéìïğïßçóå OP"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [ğåñéå÷üìåíï|íïıìåñï]\t"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4293,13 +4002,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Ïé ğáëéİò ğëçñïöïñßåò åßíáé ßäéåò ìå ôéò êáéíïıñãéåò."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice option for %s is now ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice option for %s is now ON."
 
 #: modules/core/os_news.cpp:55
@@ -4308,134 +4022,97 @@ msgid "Oper news item #%d deleted."
 msgstr "Ç èİóç #%d äéáãñÜöçêå."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Ç èİóç #%d óôçí ëßóôá äåí âñİèçêå!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Íİá ôùí Opers:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d âÜóåéò, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Ğñïóôáóßá óôïõò Ops"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Ç åğéëïãŞ %s äåí ìğïñåß íá ÷ñçóéìïğïéçèåß óôï äßêôõï áõôü."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Passcode for %s is %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Ï êùäéêüò İãéíå äåêôüò - ôşñá åßóáé áíáãíùñéóìİíïò."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Ï êùäéêüò áíáãíşñéóçò áğáéôåßôáé ãéá áõôŞ ôçí åíôïëŞ.\n"
-"ÎáíáğñïóğáèŞóôå áöïı ãñÜøåôå /msg %s IDENTIFY ^_êùäéêüò^_."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "ËÜèïò êùäéêüò."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Ï êùäéêüò ãéá ôïí %s åßíáé %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "ËÜèïò êùäéêüò."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Ï êùäéêüò ôïõ %s İ÷åé óôáëèåß."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Åéñçíéêü"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace option for %s is now ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Please contact an Operator to get a vhost assigned to this nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Ğáñáêáëş ğñïóğÜèçóå îáíÜ ìå İíáí ğéï ğïëığëïêï êùäéêü. Ïé êùäéêïß ğñİğåé íá "
-"åßíáé ôïõëÜ÷éóôïí İùò ğİíôå ÷áñáêôŞñåò, íá ìçí åßíáé åıêïëïé íá ìáíôåõôïıí "
-"(ğ.÷. ôï ğñáãìáôéêü ïíïìÜ óïõ Ş ôï øåõäşíõìï óïõ), êáé íá ìçí ğåñéİ÷åé êåíü "
-"Ş äéÜöïğïõò Üëëïõò ÷áñáêôŞñåò."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Please use the symbol of # when attempting to register"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Ğáñáêáëş ğåñßìåíå %d äåõôåñüëåğôá êáé îáíáğñïóğÜèçóå."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Ğáñáêáëş ğåñßìåíå %d äåõôåñüëåğôá êáé ìåôÜ îáíá÷ñçóéìïğïßçóå ôçí åíôïëŞ "
 "ïìáäïğïßçóçò."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4453,63 +4130,125 @@ msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Ğáñáêáëş ğåñßìåíå %d äåõôåñüëåğôá ğñéí ÷ñçóéìïğïéŞóåéò ôçí åíôïëŞ SEND îáíÜ."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr ""
+"    FORBID     Êáôáóôİëåé ôï êáíÜëé,äåí ìğïñåß íá ôï ÷ñçóéìïğïéŞóç êáíåßò"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Prevent a channel from being used preserving\n"
+"               channel data and settings"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr ""
+"    FORBID     Êáôáóôİëåé İíá øåõäşíõìï,äçë ôï êÜíåé íá ìçí ôï ÷ñçóéìïğïéåß\n"
+"               êáíåßò,üğïéïò ôï ğÜñåé İ÷åé kill"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Ìõóôéêüôçôá"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "Ìõóôéêüôçôá åğéëïãŞò ôïõ bot %s åßíáé ôşñá ON."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private mode of bot %s is now on."
+msgstr "Ìõóôéêüôçôá åğéëïãŞò ôïõ bot %s åßíáé ôşñá ON."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "Private option for %s is now ON."
+
+#: modules/core/cs_set_private.cpp:33
+#, fuzzy, c-format
+msgid "Private option for %s is now on."
 msgstr "Private option for %s is now ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Ğñïóôáóßá"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [ğåñéå÷üìåíï|íïıìåñï]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [êáíÜëé] {list | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [password]"
 
@@ -4517,15 +4256,15 @@ msgstr "RECOVER nickname [password]"
 msgid "REGISTER channel description"
 msgstr "REGISTER channel description"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [password]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
@@ -4535,291 +4274,370 @@ msgid "Random news item #%d deleted."
 msgstr "Ôï ìŞíõìá óôçí èİóç #%d äéáãñÜöçêå."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Ôï ìŞíõìá óôçí èİóç #%d äåí âñİèçêå!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Íİá ãéá ôï äßêôõï:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   ÄéáâÜæåé İíá Ş ğïëëÜ ìçíıìáôá"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Åğáíáêáèïñßæåé ôï íüçìá ôùí åğéğİäùí ğñüóâáóçò"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
 msgstr ""
-"Registration step 1 may have expired, please use \"/msg %s register "
-"<password> <email>\" first."
+"    RELEASE    ÁíÜêôçóç ôçò êáôáêñÜôçóçò ôïõ øåõäùíıìïõ,ìåôÜ áğü RECOVER"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Êáôï÷õñşíåé İíá øåõäşíõìï"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Êáôï÷õñşíåé İíá øåõäşíõìï"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Íá åëëáôşíåé ôçí ÷ñŞóç \"âßáéùí\" åíôïëşí"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Releases a suspended channel"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Îáíáöïñôşíåé ôï services' configuration áñ÷åßï"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr ""
+"    RESTRICTED    Áğáãüñåõóç åéóüäïõ óôï êáíÜëé áí äåí İ÷åéò access åêåß"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Ìüíï üóïé İ÷ïõí Access"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Restricted access option for %s is now ON."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Restricted access option for %s is now ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Íá áëëÜæåé ôï topic üôáí äåí ÷ñçóéìïğïéåßôáé ôï êáíÜëé"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Åìöáíßæåé ôïí êùäéêü ãéá ôï óõãêåêñéìİíï øåõäşíõìï\n"
+"               (ìüíï áí ç êùäéêïğïßçóç åßíáé áíåíåñãŞ)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Åğéóôñİöåé ôçí óõãêåêñéìİíç access level ôïõ ÷ñŞóôç óôï\n"
+"               êáíÜëé"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY channel text"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {øåõäşíõìï | êáíÜëé} ğåñéå÷üìåíï"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 "Ç SENDPASS åíôïëŞ äåí åßíáé äéáèİóéìç ãéáôß ÷ñçóéìïğïéåßôáé ç êùäéêïğïßçóç."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST üñéï"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET channel option settings"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET channel NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET channel PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET channel option parameters"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET channel DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET channel DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET channel FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET channel GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET channel NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET channel SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET channel SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET channel XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET ^_åğéëïãŞ^_ ^_ğáñÜìåôñïé^_"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET option setting"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE ^_number^_"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [êáíÜëé] üñéï"
 
@@ -4827,7 +4645,7 @@ msgstr "SET LIMIT [êáíÜëé] üñéï"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [÷ñŞóôçò | êáíÜëé] {üñéï | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4835,24 +4653,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "Ç ëßóôá SNLINE åßíáé Üäåéá."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4860,16 +4678,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "Ç ëßóôá SQLINE åßíáé Üäåéá."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4878,54 +4696,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Ï êùäéêüò İãéíå äåêôüò - ôşñá åßóáé áíáãíùñéóìİíïò."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Ï êùäéêüò İãéíå äåêôüò - ôşñá åßóáé áíáãíùñéóìİíïò."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "Ç ëßóôá SZLINE åßíáé Üäåéá."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4934,64 +4762,121 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list} "
 "[reason]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Óşæåé ôéò âÜóåéò äåäïìİíùí êáé åğáíåêêéíåß ôá Services"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Áóöáëİò"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "ÁóöÜëåéá óôïí ÊáíáëÜñ÷ç"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Ìüíï áõôïß ğïõ İ÷ïõí access èá ğáßñíïõí op áğü opers"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "Secure founder option for %s is now ON."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr "Secure ops option for %s is now ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
+msgstr "Secure ops option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Secure option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:33
+#, fuzzy, c-format
+msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "ÁóöÜëåéá"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Óôİëíåé İíá ìŞíõìá óå İíá øåõäşíõìï Ş İíá êáíÜëé"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF  Send a memo to all opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Send a memo to all registered users"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Óôİëíåé ìŞíõìá óå üëïõò ôïõò ÷ñŞóôåò"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Íá óôİëíåé ìİóá óôï êáíÜëé ìŞíõìá ğïéïò ÷ñçóéìïğïéåß OP/"
+"DEOP \n"
+"         åíôïëİò"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Sends a memo and requests a read receipt"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Ôá Services åßíáé ôşñá óå åğéëïãŞ íá ëŞãåé."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Ôá Services åßíáé ôşñá óå åğéëïãŞ íá ìçí ëŞãåé."
 
@@ -5003,7 +4888,7 @@ msgstr "Ôá Services åßíáé ôşñá ìüíï áíÜãíùóçò."
 msgid "Services are now in read-write mode."
 msgstr "Ôá Services åßíáé óå åğéëïãŞ áíÜãíùóçò-åããñáöŞò."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Ôá Services åßíáé ôşñá óå debug åğéëïãŞ (âáèìüò %d)."
@@ -5016,7 +4901,7 @@ msgstr "Ôá Services åßíáé ôşñá óå debug åğéëïãŞ."
 msgid "Services are now in non-debug mode."
 msgstr "Ôá Services åßíáé ôşñá óå ìç-debug åğéëïãŞ."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Ïé õğçñåóßåò İ÷ïõí ñõèìéóôåß íá ìçí óôİëíïõí ìŞíõìá óôç äéåıèõíóç."
 
@@ -5026,7 +4911,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5035,151 +4920,194 @@ msgstr ""
 "Ïé õğçñåóßåò áäõíáôïıí íá áëëÜîïõí ôéò åğéëïãİò.  Ïé servers' U: ãñáììİò "
 "åßíáé ïé óùóôİò?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ìİñåò, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d şñåò, %d ëåğôÜ"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ëåğôÜ, %d äåõôåñüëåğôá"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Ôï áñ÷åßï ôùí õğçñåóéşí,conf file İãéíå reloaded,åğáíáöïñôşèçêå."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Ïé õğçñåóßåò áğåëåõèİñùááí ôï øåõäşíõìü óïõ."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Session limit ãéá ôïí %s ñõèìßóôçêå óå %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Ç Session limiting  åíôïëŞ åßíáé áğåíåñãïğïéçìİíç."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions      : %6d âÜóåéò, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr ""
+"    SET        Ñõèìßæåé ôéò åğéëïãİò êáé ôéò ğëçñïöïñßåò\n"
+"               ôïõ êáíáëéïı\t"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       ÁëëÜæåé ôïí ôığï ôïõ ban ğïõ èá êÜíïõí ôá Services"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    ÁëëÜæåé ôéò åğéëïãİò ôùí ìçíõìÜôùí"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr ""
+"    SET        ÁëëáãŞ åğéëïãşí, óõìğåñéëáìâÜíåôáé ç ğñïóôáóßá ìå áğïóıíäåóç"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          ÁëëÜæåé ôçí ğåñéãñáöŞ ôïõ êáíáëéïı"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    ÁëëÜæåé ôçí ëßóôá ôùí ïìÜäùí"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       ÁëëÜæåé ôïí founder ôïõ êáíáëéïı"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   ÁëëÜæåé ôç ãëşóóá ğïõ ÷ñçóéìïğïéïıí ïé\n"
+"                   õğçñåóßåò üôáí ôéò ÷ñçóéìïğïéåßôå"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     ÁëëÜæåé ôïí successor ôïõ êáíáëéïı"
+
+#: modules/core/hs_setall.cpp:21
 #, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Set the vhost for all nicks in a group"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Set the vhost of another user"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Ñõèìßæåéò äéÜöïñåò åğéëïãİò ôùí Services"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   ÁëëÜæåé ôïí êùäéêü ôïõ øåõäùíıìïõ óáò"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Ç åğéëïãŞ %s äåí åßíáé ãíùóôŞ.  ÃñÜøå /msg %s HELP LEVELS DESC ãéá ôç ëßóôá "
 "ìå ôéó áíáëõôéêİò åğéëïãİò."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr ""
 "Ç åğéëïãŞ ãéá DEBUG ğñİğåé íá åßíáé ON, OFF, Ş İíá êáôçãïñéìáôéêü íïıìåñï."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Ç åğéëïãŞ ãéá NOEXPIRE ğñİğåé íá åßíáé ON Ş OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Ç åğéëïãŞ ãéá READONLY ğñİğåé íá åßíáé ON Ş OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signed kick option for %s is now ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr ""
+"    STATS       Äåß÷íåé óôáôéóôéêÜ ó÷åôéêÜ ìå ôá Services êáé ôï äßêôõï"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Åìöáí. kicks ôá ïğïßá ãßíïíôáé ìå ôçí åíôïëŞ KICK"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5188,27 +5116,33 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Äçëùìİíá kicks"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Óõãíşìç, ç õğçñåóßá bot assignment åßíáé áğåíåñãïğïéçìİíç."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Óõãíşìç, ç äçìéïõñãßá ôïõ bot áğİôõ÷å."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôï bot åßíáé áğåíåñãïğïéçìİíç."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá bot åßíáé áğåíåñãïğïéçìİíç."
 
@@ -5218,7 +5152,7 @@ msgstr "Óõãíşìç, ç õğçñåóßá bot åßíáé áğåíåñãïğïéçìİíç."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ AOP åßíáé åêôüò ëåéôïõñãßáò."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ access åßíáé åêôüò ëåéôïõñãßáò."
 
@@ -5226,69 +5160,44 @@ msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ access åßíáé åêôüò ëåéôïõñãßáò."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ akick åßíáé åêôüò ëåéôïõñãßáò."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá bad words åßíáé áğåíåñãïğïéçìİíç."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá äéáãñáöŞò êáíáëéşí åßíáé áğåíåñãïğïéçìİíç."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-"Óõãíşìç, ïé åğéëïãİò ãéá ôçí ñıèìéóç ôùí êáíáëéşí åßíáé áğåíåñãïğïéçìİíåò."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá êáôï÷ıñùóåéò êáíáëéşí äåí ëåéôïõñãåß ãéá ôçí şñá."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Óõãíşìç, ç áíáãíşñéóç áğİôõ÷å."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Óõãíşìç, ç õğçñåóßá kicker åßíáé áğåíåñãïğïéçìİíç."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Óõãíşìç, ç åíôïëŞ setting åßíáé áğåíåñãïğïéçìİíç."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr ""
-"Óõãíşìç, ôá ìçíıìáôá äåí ìğïñïıí íá óôáëïıí ãéáôß åßíáé áíåíåñãŞ ç õğçñåóßá."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 "Óõãíşìç, ç õğçñåóßá ãéá íá óâŞíåé ôá  øåõäşíõìá åßíáé áğåíåñãïğïéçìİíç."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr ""
 "Óõãíşìç, ç ïìáäïğïßçóç ôïõ øåõäşíõìïı óïõ åßíáé ãéá ôçí şñá áğåíåñãïğïéçìİíç."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-"Óõãíşìç, ç õğçñåóßá ãéá ôïí êáèïñéóìü êáé ôéò åğéëïãİò ôïõ øåõäşíõìïõ åßíáé "
-"ãéá ôçí şñá áğåíåñãïğïéçìİíç."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Óõãíşìç, ç êáôï÷ıñùóç øåõäşíõìïõ åßíáé  ãéá ôçí şñá áğåíåñãïğïéçìİíç."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Óõãíşìç, ç êáôï÷ıñùóç áğİôõ÷å."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5299,12 +5208,12 @@ msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d access óôï êáíÜëé."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d ğñüóâáóç óå êáôÜôáîç ôïõ øåõäşíõìïõ."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d access óôï êáíÜëé."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d autokick ìÜóêá óôï êáíÜëé."
@@ -5314,21 +5223,16 @@ msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d autokick ìÜóêá óôï êáíÜëé."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d êáêİò ëİîåéò ãéá İíá êáíÜëé."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Óõãíşìç, İ÷åéò Şäç îåğåñÜóåé ôï üñéï êáôï÷ıñùóåéò ôùí %d êáíáëéşí."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Óõãíşìç, İ÷åéò Şäç öôÜóåé óôï üñéï êáôï÷ıñùóåéò ôùí %d êáíáëéşí."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Óõãíşìç, ìğïñåßò ìüíï íá İ÷åéò %d ğñüóâáóç óå êáôÜôáîç ôïõ øåõäşíõìïõ."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Ôá óôáôéóôéêÜ óâŞóôçêáí."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
@@ -5340,12 +5244,22 @@ msgstr "Ìçí åğáíáëáìâÜíåéò óå ğïëëİò óåéñİò!"
 msgid "Stop repeating yourself!"
 msgstr "Ìçí åğáíáëáìâÜíåéò ôá ßäéá!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER ÁóöÜëåéá ôïõ founder áğü ôï êáíÜëé"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Ìüíï üóïé İ÷ïõí access èá İ÷ïõí op"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Ï Successor ôïõ %s äåí İ÷åé ïñéóôåß."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Ï Successor ôïõ %s Üëëáîå êáé ğŞãå óôïí %s."
@@ -5354,21 +5268,36 @@ msgstr "Ï Successor ôïõ %s Üëëáîå êáé ğŞãå óôïí %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Óõìâßùóç"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "ÅğéëïãŞ óõìâßùóçò åßíáé ôşñá ON óôï êáíÜëé %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "ÅğéëïãŞ óõìâßùóçò åßíáé ôşñá ON óôï êáíÜëé %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Syncs the vhost for all nicks in a group"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Óıíôáîç åíôïëŞò: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5396,7 +5325,7 @@ msgstr ""
 "2: ôï ban èá åßíáé ôçò ìïñöŞò *!*@host\n"
 "3: ôï ban èá åßíáé ôçò ìïñöŞò *!*user@*.domain"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5409,7 +5338,7 @@ msgstr ""
 "ÁëëÜæåôå ôçí ğåñéãñáöŞ ôïõ êáíáëéïı, ç ïğïßá öİíåôáé ìå ôçí åíôïëŞ\n"
 "LIST êáé INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5422,7 +5351,7 @@ msgstr ""
 "ÁëëÜæåé ôïí founder ôïõ êáíáëéïı.  Ôï íİï øåõäşíõìï ğñİğåé íá åßíáé\n"
 "êáôï÷õñùìİíï."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5440,7 +5369,7 @@ msgstr ""
 "èá õğåíèõìßæåôáé áğü ôïí %s ìåôÜ ôïí ôåëåõôáßï ÷ñŞóôç ğïõ èá öıãåé áğü\n"
 "ôï êáíÜëé, êáé èá áğïèçêåıåôáé ãéá ôçí åğüìåíç öïñÜ."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5458,7 +5387,7 @@ msgstr ""
 "êáé \n"
 "ACCESS áğü êÜğïéï ÷ñŞóôç ãéá ôï êáíÜëé."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5475,7 +5404,7 @@ msgstr ""
 "ban Ş íá áöáéñİóåé op áğü êÜğïéïí ÷ñŞóôç ï ïğïßïò İ÷åé ìåãáëıôåñï\n"
 "level áğü áõôüí Ş ßóï ìå áõôüí ìİóù åíôïëşí %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5520,7 +5449,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5534,7 +5464,7 @@ msgstr ""
 "¼ôáí åíåñãïğïéåßôáé ç private åíôïëŞ,  ôï êáíÜëé äå óõìğåñéëáìâÜíåôáé\n"
 "óôç ëßóôá ğïõ ğñïêığôåé áğü ôçí åíôïëŞ /msg %s LIST."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5549,7 +5479,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5568,7 +5498,7 @@ msgstr ""
 "ìå ôïí êùäéêü ôïõò, èá İ÷ïõí ğñüóâáóç óôï êáíÜëé üğùò ïñßæåôáé êáé\n"
 "áğü ôç ëßóôá ğñüóâáóçò."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5588,7 +5518,7 @@ msgstr ""
 "áíáãíşñéóçò ìå ôïí %s.\n"
 "    "
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5610,7 +5540,24 @@ msgstr ""
 "áí äçë İ÷åé (%d), ôï êáíÜëé èá óâçóôåß,óáí íá ìçí åß÷å ïñéóôåß\n"
 "successor.  Ôï íİï øåõäşíõìï èá ğñİğåé íá åßíáé êáôï÷õñùìİíï."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Óıíôáîç: %s êáíÜëé KEEPTOPIC {ON | OFF}\n"
+"\n"
+"Åíåñãïğïéåß Ş áğåíåñãïğïéåß ôçí åğéëïãŞ êëåßäùìá topic ôïõ êáíáëéïı.\n"
+"¼ôáí ôï êëåßäùìá topic åßíáé on, ï %s äåí èá åğéôñİğåé óå êáíİíáí íá "
+"áëëÜîåé\n"
+"ôï topic ôïõ êáíáëéïı åêôüò ôçò åíôïëŞò TOPIC ôïõ."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5649,8 +5596,8 @@ msgstr ""
 "Áí áğü xOP system ôï ãõñßóåôå óå access system\n"
 "äåí èá õğÜñîåé êáíİíá ğñüâëçìá."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5739,7 +5686,7 @@ msgstr ""
 "\n"
 "Ç åíôïëŞ ACCESS CLEAR äéáãñÜöåé üëåò ôéó èİóåéò ôçò ëßóôáò access."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5789,7 +5736,7 @@ msgstr ""
 "        Åìöáíßæåé ôçí ôñİ÷ïõóá ëßóôá ğñüóâáóçò.\n"
 "    "
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5801,7 +5748,7 @@ msgstr ""
 "ÊÜíåé ôï bot íá åíåñãåß,äçë íá åêôåëåß åíôïëŞ \"/me\"\n"
 "åìöáíßæïíôáò ôï ìŞíõìá óôï áíÜëïãï êáíÜëé."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5821,7 +5768,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5845,7 +5792,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5901,7 +5848,7 @@ msgstr ""
 "Ç åíôïëŞ AKICK CLEAR äéáãñÜöåé üëåò ôéò èİóåéò ğïõ ğåñéİ÷ïíôáé óôçí\n"
 "ëßóôá akick."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5997,7 +5944,7 @@ msgstr ""
 "Ìüíï ãéá ôïõò Services operators.\t\n"
 "    "
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6036,7 +5983,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6053,7 +6000,7 @@ msgstr ""
 "on. With two parameters lists channels that nickname has \n"
 "level access or greater on."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6083,17 +6030,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Óıíôáîç: AOP êáíÜëé ADD øåõäşíõìï\n"
 "        AOP êáíÜëé DEL {øåõäşíõìï | íïıìåñï | ëßóôá}\n"
@@ -6133,7 +6069,7 @@ msgstr ""
 "êáé /msg %s HELP SET XOP ãéá íá îİñåôå ğùò èá åğéëİîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óıóôçìá."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6147,8 +6083,8 @@ msgstr ""
 "ìåôÜ íá ôï ñõèìßóåéò ãéá ôéò áíÜãêåò ôïõ êáíáëéïı óïõ.\n"
 "    "
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6169,20 +6105,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Óıíôáîç: BADWORDS êáíÜëé ADD ëİîç [SINGLE | START | END]\n"
 "        BADWORDS êáíÜëé DEL {ëİîç | èİóç-íïõ | list}\n"
@@ -6217,7 +6139,7 @@ msgstr ""
 "Ç åíôïëŞ BADWORDS CLEAR êáèáñßæåé üëåò ôéò èİóåéò áğü ôçí ëßóôá\n"
 "badword."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6234,7 +6156,7 @@ msgstr ""
 "access \n"
 "êáé ğáñáğÜíù óôï êáíÜëé."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6277,7 +6199,7 @@ msgstr ""
 "èá äéáãñáöåß. Åğßóçò, áí İíáò ÷ñŞóôçò ÷ñçóéìïğïéåß Şäç ôï øåõäşíõìï\n"
 "ôçí şñá ğïõ öôéÜ÷íåéò ôï bot, èá ãßíåé kill."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6287,7 +6209,7 @@ msgstr ""
 "\n"
 "Åìöáíßæåé ôçí ëßóôá ìå ôá äéáèİóéìá bots áõôïı ôïõ äéêôıïõ."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6301,7 +6223,21 @@ msgstr ""
 "íá\n"
 "ìçí İãéíå."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6313,7 +6249,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6337,7 +6273,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6349,7 +6285,7 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6364,7 +6300,7 @@ msgstr ""
 " \n"
 "Ìüíï ãéá áõôïıò ğïõ İ÷ïõí founder access óôï êáíÜëé."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6374,16 +6310,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6399,7 +6348,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6411,7 +6360,7 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6435,7 +6384,7 @@ msgstr ""
 "êáé ğáñáğÜíù access óôï êáíÜëé, Ş áğü ôïõò HOPs Ş áõôïıò ğïõ İ÷ïõí level 4 \n"
 "êáé ğáñáğÜíù ãéá íá êÜíïõí dehalfop ôïí åáõôü ôïõò."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6445,7 +6394,7 @@ msgstr ""
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6481,7 +6430,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      ÄéáãñÜöïíôáé ôá ìçíıìáôá ìå íïıìåñá 2 İùò 5 êáé 7 İùò 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6492,7 +6441,7 @@ msgstr ""
 "Deletes the vhost for all nick's in the same group as\n"
 "that of the given nick."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6512,7 +6461,7 @@ msgstr ""
 "Áğü default, ÷ñçóéìïğïéåßôáé áğü áõôïıò ğïõ åßíáé AOPs Ş áğü áõôïıò ğïõ \n"
 "İ÷ïõí âáèìü (level) 5 access êáé üóïõò İ÷ïõí ğáñáğÜíù level op/deop."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6531,7 +6480,7 @@ msgstr ""
 "Áğü default, ÷ñçóéìïğïéåßôáé áğü áõôïıò ğïõ åßíáé AOPs Ş áğü áõôïıò ğïõ \n"
 "İ÷ïõí âáèìü (level) 5 access êáé üóïõò İ÷ïõí ğáñáğÜíù level op/deop."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6554,7 +6503,7 @@ msgstr ""
 "level (âáèìü) 10 Ş êáé ğáñáğÜíù ãéá íá âãÜëïõí ôçí ğñïóôáóßá áğü ôïí åáõôü "
 "ôïõò."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6578,7 +6527,7 @@ msgstr ""
 "êáé ğáñáğÜíù óôï êáíÜëé, Ş áğü ôïõò VOPs Ş áõôïıò ğïõ İ÷ïõí level 3 \n"
 "êáé ğáñáğÜíù ãéá íá êÜíïõí devoice ôïí åáõôü ôïõò."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6590,7 +6539,7 @@ msgstr ""
 "ÊÜíåé ôï êáíÜëé îåêáôï÷õñşóçìï,ôï áöŞíåé åëåıèåñï ÷ùñßò founder. Ãéá íá\n"
 "ãßíåé áõôü ğñİğåé ï founder."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6603,8 +6552,8 @@ msgstr ""
 "ìğïñïõí íá ôï êÜíïõí áõôü óå İíá êáíÜëé, ÷ùñßò íá êÜíïõí åíôïëŞ áíáãíşñéóçò\n"
 "ãéá ôï êáíÜëé."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6636,7 +6585,7 @@ msgstr ""
 "ğëçñïöïñßåò.)\n"
 "    "
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6661,7 +6610,7 @@ msgstr ""
 "íá ôï \n"
 "êÜíïõí ïé (åğéêåöáëåßò) Services Operators."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6742,7 +6691,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Åğéêåöáëåßò Õğçñåóéşí."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6760,7 +6709,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6778,7 +6727,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6792,7 +6741,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6802,7 +6751,7 @@ msgstr ""
 "\n"
 "Óáò äåß÷íåé ôï êëåéäß ôïõ óõãêåêñéìİíïõ êáíáëéïı."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6823,7 +6772,7 @@ msgstr ""
 "\n"
 "ÁõôŞ ç åíôïëŞ äåí åßíáé äéáèİóéìç áí åßíáé åíåñãŞ ç êùäéêïğïßçóç."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6854,7 +6803,7 @@ msgstr ""
 "íá âñßóêåôáé óôç ëßóôá ğñüóâáóçò ôïõ øåõäùíıìïõ, Ş íá İ÷åôå\n"
 "äşóåé ôïí óùóôü êùäéêü ãéá ôï øåõäşíõìï."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6864,7 +6813,7 @@ msgstr ""
 "\n"
 "Åìöáíßæåé üëá ôá øåõäşíõìá ğïõ áíŞêïõí óôçí ßäéá ïìÜäá."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6897,7 +6846,7 @@ msgstr ""
 "Åğéôñİğåé óôïõò IRCops íá óôİëíïõí ìõíŞìáôá óå üëïõò ôïõò ÷ñŞóôåò ôïõ \n"
 "äéêôıïõ.  Ôï ìŞíõìá èá óôİëíåôáé áğü ôï øåõäşíõìï õğçñåóßáò %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6911,7 +6860,8 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6979,7 +6929,7 @@ msgstr ""
 "Óçìåßùóç: üëá ôá øåõäşíõìá ğïõ áíŞêïõí óôçí ßäéá ïìÜäá İ÷ïõí ôïí ßäéï \n"
 "êùäéêü."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7002,7 +6952,7 @@ msgstr ""
 "êáé ğáñáğÜíù access óôï êáíÜëé, Ş áğü ôïõò HOPs Ş áõôïıò ğïõ İ÷ïõí level 4 \n"
 "êáé ğáñáğÜíù ãéá íá êÜíïõí halfop ôïí åáõôü ôïõò."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7031,16 +6981,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Óıíôáîç: HOP êáíÜëé ADD øåõäşíõìï\n"
 "        HOP êáíÜëé DEL {øåõäşíõìï | èİóåéò-íïõ | list}\n"
@@ -7081,7 +7021,7 @@ msgstr ""
 "êáé /msg %s HELP SET XOP ãéá íá îİñåôå ğùò èá åğéëİîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óıóôçìá."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7100,7 +7040,7 @@ msgstr ""
 "ï ßäéïò ìå áõôüí ğïõ İäùóåò ãéá íá êáôï÷õñşóçò ôï øåõäşíõìï,\n"
 "äçë ìå ôçí REGISTER åíôïëŞ."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7110,7 +7050,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7143,7 +7083,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7165,7 +7105,7 @@ msgstr ""
 "Áğü default, ç åğéëïãŞ ALL åßíáé ïñéóìİíç ìüíï óå áõôïıò ğïõ İ÷ïõí\n"
 "founder access óôï óõãêåêñéìİíï êáíÜëé."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7182,7 +7122,7 @@ msgstr ""
 "÷ñçóéìïğïéŞóåôå ôçí ğáñÜìåôñï ALL óôçí åíôïëŞ, èá äåßôå\n"
 "üëåò ôéò ğëçñïöïñßåò, Üó÷åôá áí áõôİò áğïêñığôïíôáé Ş ü÷é."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7197,7 +7137,7 @@ msgstr ""
 "áğü áõôÜ äåí İ÷ïõí äéáâáóôåß, êáé ğüóá ìçíıìáôá ìğïñåßôå íá ëÜâåôå.\n"
 "Ìå ôçí ğáñÜìåôñï, åìöáíßæïíôáé ïé ßäéåò ğëçñïöïñßåò êáé ãéá İíá êáíÜëé."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7224,7 +7164,7 @@ msgstr ""
 "áíÜëïãï øåõäşíõìï.  ÁõôŞ ç åíôïëŞ åßíáé ìüíï ãéá ôïõò Services\n"
 "admins."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7243,7 +7183,7 @@ msgstr ""
 "èá äåéò ğëçñïöïñßåò ó÷åôéêÜ ìå ôï bot.\n"
 "    "
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7288,7 +7228,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7305,7 +7245,8 @@ msgstr ""
 "access \n"
 "êáé ğáñáğÜíù óôï êáíÜëé."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7330,7 +7271,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7350,8 +7291,8 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7427,7 +7368,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7445,7 +7386,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7462,7 +7403,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7489,7 +7430,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7505,7 +7446,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7528,7 +7469,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7544,7 +7485,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7561,7 +7502,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7578,7 +7519,7 @@ msgstr ""
 "êáé ìåôÜ ban. Ìçí ğñïóğáèŞóåôå íá áğåíåñãïğïéŞóåôå ôï ttb\n"
 "ãéáôß ôï óıóôçìá èá ôï åíåñãïğïéŞóåé îáíÜ."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7631,7 +7572,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7655,7 +7596,7 @@ msgstr ""
 "The list uses the value of NSListMax as a hard limit for the\n"
 "number of items to display to a operator at any 1 time."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7670,7 +7611,7 @@ msgstr ""
 "øÜîåé.\n"
 "(Ôá êáíÜëéá ğïõ İ÷ïõí åğéëïãŞ PRIVATE äåí åìöáíßæïíôáé.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7712,7 +7653,7 @@ msgstr ""
 "        Åìöáíßæåé üëá ôá øåõäşíõìá ğïõ áíïßêïõí óå ÷ñŞóôåò\n"
 "        ğïõ óõíäİïíôáé ìå äéåıèõíóç bar.org."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7764,7 +7705,7 @@ msgstr ""
 "        Åìöáíßæåé üëá ôá êáôï÷õñùìİíá øåõäşíõìá ğïõ åßíáé óå no-expire.\n"
 "        "
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7787,11 +7728,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "     Ëßóôá ìçíõìÜôùí íïıìåñï 2 ğåñíÜ 5 êáé 7 ğåñíÜ 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Óıíôáîç: LOGONNEWS ADD ğåñéå÷üìåíï"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7824,7 +7775,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Óıíôáîç: LOGONNEWS DEL {íïıìåñï | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7840,7 +7791,7 @@ msgstr ""
 "ğëİïí. Óçìåßùóç, üğùò êáé íá÷åé, äåí èá óïõ ãßíåé ğáñáôŞñçóç Ş íá óïõ \n"
 "æçôçèåß íá îáíáêÜíåéò åíôïëŞ áíáãíşñéóçò."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7865,23 +7816,7 @@ msgstr ""
 "REVALIDATE, ïé õğçñåóßåò èá óå ñùôŞóïõí ãéá ğïéï øåõäşíõìï.\n"
 "Áõôü ôï êÜíïõí ìüíï ïé (åğéêåöáëåßò) Services operators."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Óıíôáîç: MODE êáíÜëé modes\n"
-"\n"
-"Åğéôñİğåé óôïõò Services operators íá áëëÜæïõí ôá modes êÜèå êáíáëéïı.\n"
-"Ïé ğáñÜìåôñïé åßíáé ßäéïé óáí ôçò åíôïëŞò /MODE.\n"
-"    \n"
-"Ìüíï ãéá ôïõò Services operators."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7908,7 +7843,23 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Óıíôáîç: MODE êáíÜëé modes\n"
+"\n"
+"Åğéôñİğåé óôïõò Services operators íá áëëÜæïõí ôá modes êÜèå êáíáëéïı.\n"
+"Ïé ğáñÜìåôñïé åßíáé ßäéïé óáí ôçò åíôïëŞò /MODE.\n"
+"    \n"
+"Ìüíï ãéá ôïõò Services operators."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7917,7 +7868,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7927,7 +7878,7 @@ msgstr ""
 "\n"
 "Lists all currently loaded modules."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7938,7 +7889,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7949,7 +7900,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7960,7 +7911,7 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7990,7 +7941,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8002,7 +7953,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8016,7 +7967,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8028,7 +7979,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8052,7 +8003,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Óıíôáîç: OPERNEWS ADD ğåñéå÷üìåíï"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8085,7 +8036,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Óıíôáîç: OPERNEWS DEL {íïıìåñï | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8104,7 +8055,7 @@ msgstr ""
 "Áğü default, ÷ñçóéìïğïéåßôáé áğü áõôïıò ğïõ åßíáé AOPs Ş áğü áõôïıò ğïõ \n"
 "İ÷ïõí âáèìü (level) 5 access êáé üóïõò İ÷ïõí ğáñáğÜíù level op/deop."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8125,7 +8076,7 @@ msgstr ""
 "İ÷ïõí \n"
 "level (âáèìü) 10 Ş êáé ğáñáğÜíù ãéá íá ğñïóôáôåıïõí ôïí åáõôü ôïõò."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8154,16 +8105,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8202,7 +8143,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8227,7 +8168,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Óıíôáîç: RANDOMNEWS ADD ğåñéå÷üìåíï"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8253,7 +8194,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Óıíôáîç: RANDOMNEWS DEL {íïıìåñï | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8278,7 +8219,8 @@ msgstr ""
 "   ÄéÜâáóå 2-5,7-9\n"
 "      Åìöáíßæåé ôá ìçíıìáôá ìå ôá íïıìåñá 2 İùò êáé 5 êáé 7 İùò êáé 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8326,8 +8268,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8369,8 +8311,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8437,7 +8379,7 @@ msgstr ""
 "äéêáéùìÜôùí óôá êáíÜëéá. Ãéá ğåñéóóüôåñåò ğëçñïöïñßåò ãéá áõôŞ \n"
 "ôç ìåëëïíôéêŞ åíôïëŞ, ãñÜøå /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8466,7 +8408,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8484,7 +8426,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8496,7 +8438,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8522,7 +8464,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators.\t"
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8545,7 +8487,7 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8556,7 +8498,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8571,7 +8513,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8583,7 +8525,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8593,7 +8535,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8609,7 +8551,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8632,7 +8574,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8665,24 +8607,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8696,7 +8621,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8708,7 +8633,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8719,7 +8644,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8738,7 +8663,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8761,7 +8686,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8772,7 +8697,7 @@ msgstr ""
 "ÊÜíåé ôï bot íá ëİåé ôï ìŞíõìá ğïõ ôïõ äşóáôå íá ôï åìöáíßóåé óôï áíÜëïãï \n"
 "êáíÜëé."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8791,7 +8716,7 @@ msgstr ""
 "Ôï øåõäşíõìï Ş ôï êáíÜëé ğïõ äßíåôáé, ğñİğåé íá åßíáé êáôï÷õñùìİíï.\n"
 "    "
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8801,7 +8726,7 @@ msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8819,7 +8744,7 @@ msgstr ""
 "\n"
 "Ìüíï ïé IRC operators óôá äßêôõá ğïõ åßíáé ìğïñïıí íá ôï êÜíïõí."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8855,7 +8780,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Åğéêåöáëåßò Õğçñåóéşí."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8869,7 +8794,7 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> set idents for users as \n"
 "well as vhosts."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8884,8 +8809,8 @@ msgstr ""
 "ãéá İíá êáíÜëé.  ¼ôáí åíåñãïğïéåßôáé ç ğñïóôáôåõìİíç äéá÷åßñçóç, ïé\n"
 "÷ñŞóôåò ğïõ äåí åßíáé óôç ëßóôá ğñüóâáóçò, äå ìğïñïıí íá ğÜñïõí op."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8909,26 +8834,9 @@ msgstr ""
 "ìå ôçí SIGNKICK level ôïõ êáíáëéïı äåí èá İ÷ïõí \n"
 "kicks signed. Äåò /msg %s HELP LEVELS ãéá ğåñéóóüôåñåò ğëçñïöïñßåò. "
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Óıíôáîç: %s êáíÜëé KEEPTOPIC {ON | OFF}\n"
-"\n"
-"Åíåñãïğïéåß Ş áğåíåñãïğïéåß ôçí åğéëïãŞ êëåßäùìá topic ôïõ êáíáëéïı.\n"
-"¼ôáí ôï êëåßäùìá topic åßíáé on, ï %s äåí èá åğéôñİğåé óå êáíİíáí íá "
-"áëëÜîåé\n"
-"ôï topic ôïõ êáíáëéïı åêôüò ôçò åíôïëŞò TOPIC ôïõ."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8963,7 +8871,7 @@ msgstr ""
 "Óçìåßùóç: ç access óå áõôŞ ôçí åíôïëŞ äéåõèıíåôáé áğü ôçí\n"
 "level SET."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8976,7 +8884,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8992,7 +8900,7 @@ msgstr ""
 "\n"
 "Äéáèİóéìåò åğéëïãİò:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9006,7 +8914,7 @@ msgstr ""
 "¼ôáí åßíáé åíåñãïğïéçìİíç, ïé ops äåí èá ôñşíå kick áğü ôï bot\n"
 "áêüìá êáé áí äåí ôáéñéÜæïôí ìå ôçí NOKICK level."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9020,7 +8928,7 @@ msgstr ""
 "¼ôáí åßíáé åíåñãïğïéçìİíç, ïé voices äåí èá ôñşíå kick áğü ôï bot\n"
 "áêüìá êáé áí äåí ôáéñéÜæïôí ìå ôçí NOKICK level."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9051,7 +8959,7 @@ msgstr ""
 "(ãéá ğáñÜäåéãìá, ãéá íá ÷ñçóéìïğïéŞóåéò !op, èá ğñİğåé íá İ÷åéò áñêåôŞ \n"
 "access ãéá ôçí OPDEOP level)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9067,7 +8975,7 @@ msgstr ""
 "óôïõò ÷ñŞóôåò ğïõ èá ìğİíïõí óôï êáíÜëé, ìå ôçí ğñïõğüèåóç ïôé\n"
 "İ÷ïõí áñêåôŞ access óôï êáíÜëé."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9082,7 +8990,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9098,7 +9006,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9113,7 +9021,7 @@ msgstr ""
 "\n"
 "Ìüíï ïé Services Operators ìğïñïıí íá ôï êÜíïõí."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9130,8 +9038,8 @@ msgstr ""
 "normal áğü ôï %s óôá êáíÜëéá, üëá ôá MODEs,\n"
 "KICKs, êáé èá åìöáíßæåé ôï ìŞíõìá åéóáãùãŞò."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9158,7 +9066,7 @@ msgstr ""
 "ÃñÜøôå /msg %s HELP SET åğéëïãŞ ãéá ğåñéóóüôåñåò ğëçñïöïñßåò\n"
 "óå ìéá óõãêåêñéìİíç åğéëïãŞ."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9168,7 +9076,7 @@ msgstr ""
 "\n"
 "ÁëëÜæåé äéÜöïñåò åğéëïãİò ôïõ øåõäùíıìïõ.  Ç åğéëïãŞ ìğïñåß íá åßíáé:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9194,7 +9102,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9206,7 +9114,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9218,7 +9126,7 @@ msgstr ""
 "Âëİğåéò óôç ëßóôá ôï øåõäşíõìï óïõ óå ğïéá ïìÜäá åßíáé ôùí \n"
 "õğçñåóéşí. Óôç ëßóôá ğñİğåé íá åßíáé ôï øåõäşíõìï ğïõ åßíáé óôçí ïìÜäá."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9233,7 +9141,7 @@ msgstr ""
 "ğëçñïöïñßåò\n"
 "óôï êáíÜëé ìå ôçí åíôïëŞ INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9250,7 +9158,7 @@ msgstr ""
 "ç åğéëïãŞ GREET èá åßíáé åíåñãïğïéçìİíç, êáé ìå ôçí ğñïõğüèåóç ïôé èá İ÷åéò\n"
 "êáé ôçí êáôÜëëçëç access óå áõôü. "
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9274,7 +9182,7 @@ msgstr ""
 "Ç äåıôåñç ğáñÜìåôñïò êáèïñßæåé ôï áí ç ğëçñïöïñßá èá ğñİğåé\n"
 "íá åìöáíßæåôáé (OFF) Ş íá áğïêñığôåôáé (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9309,7 +9217,7 @@ msgstr ""
 "åßíáé áğïëıôùò áğáñáßôçôï.  Åğßóçò, ïé äéá÷åéñéóôİò ôïõ\n"
 "äéêôıïõ ìğïñåß íá İ÷ïõí áğåíåñãïğïéŞóåé áõôŞ ôçí åğéëïãŞ."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9327,7 +9235,7 @@ msgstr ""
 "Ôï íïıìåñï ğñİğåé íá åßíáé İíá áğü ôá åğüìåíá ğïõ õğÜñ÷ïõí óôçí ëßóôá\n"
 "õğïóôçñéæüìåíùí ãëùóóşí:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9344,7 +9252,7 @@ msgstr ""
 "äå èá ìğïñåß íá óáò óôåßëåé ìçíıìáôá.  ĞÜíôùò äå ìğïñåßôå\n"
 "íá ïñßóåôå ôïí áñéèìü ğÜíù áğü %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9385,7 +9293,7 @@ msgstr ""
 "Äåí ìğïñïıí íá îåğåñÜóïõí ôï üñéï ôùí %d ìçíõìÜôùí, êáé äåí ìğïñïıí íá\n"
 "åğéëİîïõí hard limit."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9394,7 +9302,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9409,7 +9317,7 @@ msgstr ""
 "÷ñçóéìïğïéïıí ìçíıìáôá, äéáöïñåôéêÜ èá ÷ñçóéìïğïéïıí ğáñáôçñŞóåéò \n"
 "(notices). "
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9428,7 +9336,7 @@ msgstr ""
 "ÁõôŞ ç åğéëïãŞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëŞ-line åğéëïãŞ\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9465,7 +9373,7 @@ msgstr ""
 "\n"
 "Ç åğéëïãŞ ON ğéï ïõóéşäçò,ç LOGON êáé ç NEW óõíäéáóôéêŞ."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9477,7 +9385,7 @@ msgstr ""
 "ÁëëÜæåé ôïí êùäéêü ğïõ ÷ñçóéìïğïéåßò ãéá ôçí åíôïëŞ áíáãíşñéóçò ôïõ êÜôï÷ïõ\n"
 "øåõäşíõìïõ."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9498,7 +9406,7 @@ msgstr ""
 "áêüìç íá ğÜñåé ğëçñïöïñßåò ãé áõôü, ÷ñçóéìïğïéşíôáò ôçí\n"
 "åíôïëŞ INFO)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9528,7 +9436,7 @@ msgstr ""
 "ÁõôŞ ç åğéëïãŞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëŞ-line åğéëïãŞ\n"
 "-readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9550,7 +9458,7 @@ msgstr ""
 "¼ğùò êáé íá÷åé, áí åßóáé óôçí ëßóôá access, ï %s\n"
 "äåí èá êÜíåé auto-kill ìå ôçí õğüëçøç ôçò åğéëïãŞò KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9564,7 +9472,7 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9583,7 +9491,7 @@ msgstr ""
 "* NOTE, this will not update the vhost for any nick's\n"
 "added to the group after this command was used."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9596,7 +9504,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9690,7 +9598,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9720,16 +9628,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Óıíôáîç: SOP êáíÜëé ADD øåõäşíõìï\n"
 "    SOP êáíÜëé DEL {øåõäşíõìï | èİóåéò-íïõ | list}\n"
@@ -9769,7 +9667,7 @@ msgstr ""
 "êáé /msg %s HELP SET XOP ãéá íá îİñåôå ğùò èá åğéëİîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óıóôçìá."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9870,7 +9768,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9880,7 +9778,7 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9890,7 +9788,7 @@ msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9930,7 +9828,7 @@ msgstr ""
 "The RESET option currently resets the maximum user count\n"
 "to the number of users currently present on the network."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9956,7 +9854,7 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10003,7 +9901,7 @@ msgstr ""
 "õğüëïéğá èá áãíïïıíôáé. If no nickname is given, your status\n"
 "will be returned."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10021,7 +9919,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10031,7 +9929,7 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10122,7 +10020,8 @@ msgstr ""
 "\n"
 "Ìüíï ãéá ôïõò Services operators."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10146,21 +10045,7 @@ msgstr ""
 "Áğü default, ÷ñçóéìïğïåßôáé ìüíï áğü áõôïıò ğïõ İ÷ïõí founder access óôï\n"
 "êáíÜëé. "
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: UMODE user modes\n"
-"\n"
-"Allows Services Operators to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10177,7 +10062,7 @@ msgstr ""
 "ãéá ôçí ğåñßğôùóç ğïõ èåò íá ôï âÜëåéò áñãüôåñá.\n"
 "    "
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10197,7 +10082,7 @@ msgstr ""
 "ğáñáğÜíù óôï êáíÜëé.\n"
 "    "
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10214,7 +10099,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10226,7 +10111,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10241,7 +10126,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10266,7 +10151,7 @@ msgstr ""
 "    \n"
 "Ìüíï ãéá ôïõò Services Operators."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10289,7 +10174,7 @@ msgstr ""
 "êáé ğáñáğÜíù óôï êáíÜëé, Ş áğü ôïõò VOPs Ş áõôïıò ğïõ İ÷ïõí level 3 \n"
 "êáé ğáñáğÜíù ãéá íá êÜíïõí voice ôïí åáõôü ôïõò."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10318,16 +10203,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Óıíôáîç: VOP êáíÜëé ADD øåõäşíõìï\n"
 "        VOP êáíÜëé DEL {øåõäşíõìï | èİóåéò-íïõ | list}\n"
@@ -10367,7 +10242,7 @@ msgstr ""
 "êáé /msg %s HELP SET XOP ãéá íá îİñåôå ğùò èá åğéëİîåôå áíÜìåóá óôï \n"
 "access list êáé xOP list óıóôçìá."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10383,7 +10258,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10391,7 +10266,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10399,7 +10274,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10411,51 +10286,101 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC êáíÜëé [topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Áöáéñåß ğñïóùñéíÜ üëåò ôéò O:ãñáììİò áğü ôïí server \n"
+"                    áõôüìáôá"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr ""
+"    SHUTDOWN    Ôåñìáôßæåé ôï ğñüãñáììá ôùí Services ìå ôáõôü÷ñïíï ãñÜøéìï "
+"ôùí\n"
+"        áëëáãşí"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr ""
+"    QUIT        Ôåñìáôßæåé ôï ğñüãñáììá ôùí Services ÷ùñßò íá óşóåé ôéò "
+"áëëáãİò"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "Ç IMMED åğéëïãŞ äåí åßíáé äéáèİóéìç óå áõôü ôï äßêôõï."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Ç ëßóôá AKILL êáèáñßóôçêå."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "Ç ëßóôá SNLINE êáèáñßóôçêå."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "Ç ëßóôá SQLINE êáèáñßóôçêå."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "Ç ëßóôá SZLINE êáèáñßóôçêå."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10466,89 +10391,79 @@ msgstr ""
 "ôá levels (âáèìïß) ãéá AUTODEOP êáé NOJOIN åßíáé ôá ìİãéóôá levels,\n"
 "åíş üëá ôá Üëëá åßíáé ôá åëÜ÷éóôá levels."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Ôï host %s İ÷åé ùò ôşñá %d sessions ìå üñéï ôï %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Ôï üñéï ôùí ìçíõìÜôùí ãéá ôïí %s äåí ìğïñåß íá áëëá÷ôåß."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Ç íİá åğßäåéîç åßíáé ôşñá %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10556,7 +10471,8 @@ msgstr ""
 "Äåí õğÜñ÷ïõí äéáèİóéìá bots áõôŞ ôç óôéãìŞ.\n"
 "Ñşôá ôïí Services Operator íá óïõ öôéÜîåé İíá!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10566,20 +10482,12 @@ msgstr ""
 "ÃñÜøå /msg %s HELP GLIST êáé /msg %s HELP DROP \n"
 "ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"There is a new memo on channel %s.\n"
-"Type /msg %s READ %s %d to read it."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Äåí õğÜñ÷åé bot ğïõ íá åßíáé óôï %s ôşñá ğéá."
@@ -10600,7 +10508,7 @@ msgstr "Äåí õğÜñ÷ïõí íİá."
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10614,86 +10522,40 @@ msgstr ""
 "    NOBOT            Äåß÷íåé ôï bot ğïõ İãéíå assign áğü ôï êáíÜëé \n"
 "    PRIVATE          Äåëé÷íåé ôï bot ğïõ İãéíå assigned áğü ìç IRC operators"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "This channel has been forbidden."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Áõôü ôï êáíÜëé İ÷åé êáôï÷õñùèåß ìå ôïí %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "This channel has been suspended."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Áõôü ôï êáíÜëé äåí ìğïñåß íá ÷ñçóéìïğïéçèåß."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Áõôü ôï êáíÜëé äåí èá ëŞîåé."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Áõôü ôï øåõäşíõìï áíŞêåé óå êÜğïéïí Üëëïí.  Ğáñáêáëş äéÜëåîå êÜğïéï Üëëï.\n"
-"(Áí áõôü åßíáé ôï øåõäşíõìü óïõ, ãñÜøå /msg %s IDENTIFY ^_êùäéêü^_.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr ""
-"Áõôü ôï øåõäşíõìï åßíáé Şäç êáôï÷õñùìİíï; äåí ìğïñåßò íá ôï ÷ñçóéìïğïéŞóåéò."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Áõôü ôï øåõäşíõìï åßíáé êáôï÷õñùìİíï êáé ğñïóôáôåõìİíï.  Áí áõôü åßíáé ôï\n"
-"øåõäşíõìï óïõ, ãñÜøå /msg %s IDENTIFY ^_êùäéêü^_.  Áëëéşò,\n"
-"ğáñáêáëş äéÜëåîå êÜğïéï Üëëï øåõäşíõìï."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Áõôü ôï øåõäşíõìï äåí èá ëŞîåé ğïôİ."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 "Áõôü ôï øåõäşíõìï äåí ìğïñåß íá ÷ñçóéìïğïéçèåß.  Ğáñáêáëş äéÜëåîå êÜğïéï "
 "Üëëï."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Áõôü ôï øåõäşíõìï äåí èá ëŞîåé ğïôİ."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10701,30 +10563,61 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr ""
+"    XOP           Áí åßíáé ON äïõëåıåé ìå AOP/SOP,áí åßíáé off ìå access"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Êëåßäùìá ôïõ Topic"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Topic åííáëáãŞò"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Ôï Topic ìğïñåß íá áëëÜîåé ìå ôçí åíôïëŞ TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Topic lock option for %s is now ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now on."
+msgstr "Topic lock option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Topic retention option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now on."
 msgstr "Topic retention option for %s is now ON."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Ìçí ãñÜöåéò ìå êåöáëáßá ãñÜììáôá!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
 #, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Åíåñãïğïéåß/áğåíåñãïğïéåß ôç ëåéôïõñãßá áóöÜëåéáò"
+
+#: modules/core/ns_set_kill.cpp:21
+#, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Åíåñãïğïéåß/áğåíåñãïğïéåß ôçí ğñïóôáóßá ìå áğïóıíäåóç"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10740,7 +10633,8 @@ msgstr ""
 "    êáíáëéïı. Áõôü ìğïñåß íá áëëÜîåé ìå ôçí åíôïëŞ\n"
 "    LEVELS ôïõ %s."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10750,7 +10644,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10758,7 +10653,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10766,132 +10662,132 @@ msgstr ""
 "ÃñÜøå /msg %s HELP åğéëïãŞ ãéá ğåñéóóüôåñåò ğëçñïöïñßåò\n"
 "ãéá ôçí êÜèå åíôïëŞ."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"ÃñÜøå /msg %s SET EMAIL ^_e-mail^_ ãéá íá ğñïóèİóåéò ôï e-mail óôéò "
-"ğëçñïöïñßåò ôïõ øåõäşíõìïı óïõ.\n"
-"Ç ìõóôéêüôçôá åßíáé óåâáóôŞ; áõôü ôï e-mail êáé ï êùäéêüò ôïõ äåí ğñİğåé íá "
-"äùèåß óå\n"
-"êáíİíá ôñßôï ğñüóùğï."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "ÃñÜøå /msg %s LIST NEW ãéá íá äåéò ôçí ëßóôá ìå ôá ìçíıìáôá."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "ÃñÜøå /msg %s READ %d ãéá íá äéáâÜóåéò."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "ÃñÜøå /msg %s READ LAST ãéá íá ôï äéáâÜóåéò."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modes"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"ÃñÜøå /msg %s SET EMAIL ^_e-mail^_ ãéá íá ğñïóèİóåéò ôï e-mail óôéò "
+"ğëçñïöïñßåò ôïõ øåõäşíõìïı óïõ.\n"
+"Ç ìõóôéêüôçôá åßíáé óåâáóôŞ; áõôü ôï e-mail êáé ï êùäéêüò ôïõ äåí ğñİğåé íá "
+"äùèåß óå\n"
+"êáíİíá ôñßôï ğñüóùğï."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN chan"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN êáíÜëé [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Un-Load a module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "¢ãíùóôç SET åğéëïãŞ %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "¢ãíùóôç STATS åğéëïãŞ %s.."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "¢ãíùóôç åíôïëŞ %s.  \"/msg %s HELP\" ãéá âïŞèåéá."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "¢ãíùóôç åğéëïãŞ ÷áñáêôŞñá %c áãíïŞèçêå."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "¢ãíùóôç åğéëïãŞ %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"¢ãíùóôç åğéëïãŞ %s.\n"
-"ÃñÜøå /msg %s HELP SET ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Ãßíåôáé Update óôéò âÜóåéò äåäïìİíùí."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "×ñŞóôçò          : %6d âÜóåéò, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"User claiming your nick has been killed.\n"
-"/msg %s RELEASE %s to get it back before %s timeout."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10899,16 +10795,35 @@ msgstr ""
 "Ëßóôá ÷ñçóôşí:\n"
 "¼íïìá                 ÌÜóêá"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Ï Founder ôïõ %s Üëëáîå êáé ğŞãå óôïí %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Âëİğåéò ôçí ëßóôá ìå ôá host sessions"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Ğñïóôáóßá óôïõò Voices"
 
@@ -10935,16 +10850,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Ğñüóå÷å ôçí ãëşóóá óïõ!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Åßóáé Şäç ìİëïò ôçò ïìÜäáò ôïõ %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10953,11 +10868,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Äåí İ÷åéò ôçí Üäåéá íá åßóáé óå áõôü ôï êáíÜëé."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr ""
 "Äåí İ÷åéò ôï äéêáßùìá íá áëëÜîåéò ôï üñéï ôùí ìçíõìÜôùí ğïõ èá ëáìâÜíåéò."
@@ -10966,11 +10877,12 @@ msgstr ""
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10978,41 +10890,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Åßóáé ôşñá ìİóá óôçí ïìÜäá ôïõ %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Äåí ìğïñåßò íá óêïôşóåéò ôïí åáõôü óïõ!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Can't logout %s because he's a Services Operator."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Äåí ìğïñåßò íá øÜ÷íåéò ôïí åáõôü óïõ!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11022,7 +10935,8 @@ msgstr ""
 "×ñçóéìïğïßçóå AOP, SOP êáé VOP åíôïëİò áíôß ãéá ôçí access.\n"
 "ÃñÜøå /msg %s HELP command ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11033,6 +10947,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11041,58 +10956,68 @@ msgstr ""
 "åíôïëŞ áíôß ãéá áõôŞ.\n"
 "ÃñÜøå /msg %s HELP ACCESS ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Äåí ìğïñåßò íá èİóåéò ùò üñéï ìçíõìÜôùí ãéá ôïí %s ìåãáëıôåñï áğü %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Äåí ìğïñåßò íá èİóåéò ùò üñéï ìçíõìÜôùí ìåãáëıôåñï áğü %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr ""
 "Äåí ìğïñåßò íá áğåíåñãïğïéŞóåéò ôçí äéåıèõíóç ôïõ e-mail óå áõôü ôï äßêôõï."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Ìİ÷ñé óôéãìŞò İ÷åéò %d ìçíıìáôá, åê ôùí ïğïßùí %d äåí İ÷ïõí äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Ìİ÷ñé óôéãìŞò İ÷åéò %d ìçíıìáôá, åê ôùí ïğïßùí 1 äåí İ÷åé äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Ìİ÷ñé óôéãìŞò İ÷åéò %d ìçíıìáôá."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 "Ìİ÷ñé óôéãìŞò İ÷åéò %d ìçíıìáôá; åê ôùí ïğïßùí üëá äåí İ÷ïõí äéáâáóôåß."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Ìİ÷ñé óôéãìŞò İ÷åéò 1 memo, êáé äåí ôï İ÷åéò äéáâÜóåé."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Ìİ÷ñé óôéãìŞò İ÷åéò 1 ìŞíõìá."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Ìİ÷ñéò óôéãìŞò äåí İ÷åéò êáíİíá ìŞíõìá."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11102,63 +11027,45 @@ msgstr "¸÷åéò %d íİá ìçíıìáôá."
 msgid "You have 1 new memo."
 msgstr "¸÷åéò 1 íİï ìŞíõìá."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"¸÷åéò İíá íİï ìŞíõìá áğü %s.\n"
-"ÃñÜøå /msg %s READ %d ãéá íá ôï äéáâÜóåéò."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "ãéíåò unban áğü ôï %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Äåí İ÷åéò èİóåé êáíİíá áñéèìü óôï üñéï ùóôå íá êñáôŞóåéò ìçíıìáôá."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Äåí İ÷åéò ìçíıìáôá."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Äåí İ÷åéò íİá ìçíıìáôá."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
+#: modules/core/cs_register.cpp:47
+msgid "You must be a channel operator to register the channel."
 msgstr ""
-"Ğñİğåé íá êÜíåéò assign óôï bot ãéá íá ìğåß óôï êáíÜëé.\n"
-"ÃñÜøå /msg %s HELP ASSIGN ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
+"Ğñİğåé íá åßóáé íá İ÷åéò operator status óôï êáíÜëé ãéá íá ôï êáôï÷õñşóåéò."
 
-#: modules/core/cs_register.cpp:48
-msgid "You must be a channel operator to register the channel."
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
 msgstr ""
 "Ğñİğåé íá åßóáé íá İ÷åéò operator status óôï êáíÜëé ãéá íá ôï êáôï÷õñşóåéò."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11168,23 +11075,23 @@ msgstr ""
 "Ìå áõôü ôï e-mail èá ìğïñåßò íá ëÜâåéò ôïí êùäéêü óïõ óå\n"
 "ğåñßğôùóç ğïõ ôïí îå÷Üóåéò."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Èá åéäïğïéçèåßò ãéá íİá ìçíıìáôá üôáí êÜíåéò logon êáé üôáí öôÜóïõí."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Èá åéäïğïéçèåßò ãéá íİá ìçíıìáôá óôï logon."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Èá åéäïğïéçèåßò ãéá íİá ìçíıìáôá üôáí èá öôÜóïõí."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Äåí èá åßóáé éêáíüò íá ëÜâåéò Üëëá ìçíıìáôá."
 
@@ -11192,7 +11099,7 @@ msgstr "Äåí èá åßóáé éêáíüò íá ëÜâåéò Üëëá ìçíıìáôá."
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Äåí èá óïõ ãßíåé ğáñáôŞñçóç ãéá íİá ìçíıìáôá."
 
@@ -11200,18 +11107,20 @@ msgstr "Äåí èá óïõ ãßíåé ğáñáôŞñçóç ãéá íİá ìçíıìáôá."
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "You are already identified."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11227,35 +11136,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Your access list is empty."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "¼ëåò ïé O:ãñáììİò ôïõ %s İ÷ïõí áğïìáêñõíèåß."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Ç ëßóôá ignore ôùí õğçñåóéşí åßíáé Üäåéá."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé áğåíåñãïğïéçìİíï."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Ôï üñéï ìçíõìÜôùí Üëëáîå óå %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé %d, êáé äåí ìğïñåß íá áëëá÷ôåß."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Ôï üñéï ìçíõìÜôùí åßíáé 0; äåí èá ëÜâåéò ğïôİ êáíİíá Üëëï ìŞíõìá."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11263,63 +11193,59 @@ msgstr ""
 "Ôï üñéï ìçíõìÜôùí åßíáé 0; äåí èá ëÜâåéò ğïôİ êáíİíá Üëëï ìŞíõìá.  Äåí "
 "ìğïñåßò íá áëëÜîåéò áõôü ôï üñéï."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr ""
 "Ôï øåõäşíõìï óïõ äåí ôï êáôİ÷åéò ôşñá,ğñİğåé íá êÜíåéò ğÜëé åíôïëŞ "
 "áíáãíşñéóçò ãéá íá ôï êáôİ÷åéò."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Áõôü ôï øåõäşíõìï åßíáé Şäç êáôï÷õñùìİíï; ãñÜøå /msg %s DROP áñ÷éêÜ."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Áõôü ôï øåõäşíõìï äåí İ÷åé êáôï÷õñùèåß."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Ôï øåõäşíõìü óïõ óâŞóôçêå åğéôõ÷şò áğü ôçí õğçñåóßá."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Ôï øåõäşíõìü óïõ İ÷åé áëëÜîåé óå %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Ï êùäéêüò óïõ åßíáé %s - èõìŞóïõ ôïí ãéá áñãüôåñç ÷ñŞóç."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11338,94 +11264,95 @@ msgstr "[Íİá ãéá Opers - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Íİá ó÷åôéêÜ ìå ôï äßêôõï - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "äåí ëŞãåé ğïôİ"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "ëŞãåé óôçí åğüìåíç áíáâÜèìéóç õğçñåóéşí"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "ëŞãåé ìİóá óå %d ìİñá"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "ëŞãåé ìİóá óå %d ìİñåò"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "ëŞãåé ìİóá óå %d şñá, %d ëåğôÜ"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "ëŞãåé ìİóá óå %d şñá, %d ëåğôÜ"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "ëŞãåé ìİóá óå %d şñåò, %d ëåğôÜ"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "ëŞãåé ìİóá óå %d şñåò, %d ëåğôÜ"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "ëŞãåé ìİóá óå %d ëåğôü"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "ëŞãåé ìİóá óå %d ëåğôÜ"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "xOP ëßóôá óõóôŞìáôïò"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "xOP lists system for %s is now ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "xOP lists system for %s is now ON."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11434,563 +11361,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {øåõäşíõìï | êáíÜëé} ğåñéå÷üìåíï"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí AOP ëßóôá ôïõ %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "Ï/ç %s ğñïóèİèçêå åğéôõ÷şò óôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "Ï/ç %s äéáãñÜöçêå åğéôõ÷şò áğü ôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "Ï/ç %s äéáãñÜöçêå åğéôõ÷şò áğü ôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "Ï/ç %s äéáãñÜöçêå åğéôõ÷şò áğü ôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s moved to %s HOP list."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s moved to %s SOP list."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s moved to %s VOP list."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "Ï/ç %s äåí âñİèçêå óôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "Ï/ç %s äåí âñİèçêå óôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "Ï/ç %s äåí âñİèçêå óôçí VOP ëßóôá ôïõ %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Åìğïäßæåé ôï øåõäşíõìü óáò íá åìöáíßæåôáé\n"
-#~ "                   ìå ôçí åíôïëŞ  /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d ìİñåò"
-
-#~ msgid "%d hours"
-#~ msgstr "%d şñåò"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d ëåğôÜ"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d äåõôåñüëåğôá"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "Ç HOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "Ç SOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "Ç VOP ëßóôá ôïõ %s åßíáé Üäåéá."
-
-#~ msgid "1 day"
-#~ msgstr "1 ìİñá"
-
-#~ msgid "1 hour"
-#~ msgstr "1 şñá"
-
-#~ msgid "1 minute"
-#~ msgstr "1 ëåğôü"
-
-#~ msgid "1 second"
-#~ msgstr "1 äåõôåñüëåğôï"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Åğéôñİğåôáé íá ÷ñçóéìïğïéåßôáé CLEAR åíôïëŞ"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Åğéôñİğåôáé íá ÷ñçóéìïğïéŞóåéò HALFOP/DEHALFOP åíôïëİò"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Channel %s HOP list has been cleared."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Channel %s SOP list has been cleared."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Channel %s VOP list has been cleared."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí ÇOP ëßóôá ôïõ %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "ÄéáãñÜöçêáí %d èİóåéò áğü ôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "ÄéáãñÜöçêå 1 8İóç áğü ôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "ÄéáãñÜöçêå 1 8İóç áğü ôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "ÄéáãñÜöçêå 1 8İóç áğü ôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Ç äéåıèõíóç ôïõ e-mail áğåíåñãïğïéŞèçêå."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Ôİëïò ëßóôáò ÷ñçóôşí."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Ôï ìŞíõìá õğïäï÷Şò ôïõ %s äåí İ÷åé ïñéóôåß."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Ôï Bot äåí åßíáé óôï êáíÜëé %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "  ÌŞíõìá åéóüäïõ: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Access list for %s is empty."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Ëßóôá ğñüóâáóçò ãéá %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Ôï ìŞíõìá õğïäï÷Şò ôïõ %s Üëëáîå."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Ç Fantasy åğéëïãŞ åßíáé ôùñá OFF óôï êáíÜëé %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Ç åğéëïãŞ ÷áéñåôéóìïı åßíáé OFF óôï êáíÜëé %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ç HOP ëßóôá ôïõ %s åßíáé:\n"
-#~ "  Íïıìåñï  Øåõäşíõìï"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "You have requested to have the pasword for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Åóùôåñéêü ëÜèïò - áäıíáôç ğñüóâáóç óôç ğáñÜêëçóç."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Êáíïíéóìüò Ş ğëçñïöïñßá óôç èİóç #%d äéáãñÜöçêå."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nickname Registration (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Ï êùäéêüò ôïõ øåõäşíõìïõ (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "No # found in front of channel name."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Êáíİíá Bot İ÷åé åğéëïãŞ OFF óôï êáíÜëé %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Äåí âñİèçêáí èİóåéò óôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Äåí âñİèçêáí èİóåéò óôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Äåí âñİèçêáí èİóåéò óôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Äåí õğÜñ÷åé áõôŞ ç èİóç (#%d) óôçí AOP ëßóôá ôïõ %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Äåí õğÜñ÷åé áõôŞ ç èİóç (#%d) óôçí HOP ëßóôá ôïõ %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Äåí õğÜñ÷åé áõôŞ ç èİóç (#%d) óôçí SOP ëßóôá ôïõ %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Äåí õğÜñ÷åé áõôŞ ç èİóç (#%d) óôçí VOP ëßóôá ôïõ %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice option for %s is now OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace option for %s is now OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Ğáñáêáëş ğåñßìåíå %d äåõôåñüëåğôá ğñéí ÷ñçóéìïğïéŞóåéò ôçí åíôïëŞ SEND "
-#~ "îáíÜ."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Ìõóôéêüôçôá åğéëïãŞò ôïõ bot %s åßíáé ôşñá OFF."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private option for %s is now OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr ""
-#~ "Ç åğéëïãŞ ğñïóôáóßáò åßíáé ôşñá ON, ìå êáíİíá ğåñéèşñéï íá ãßíåé åíôïëŞ "
-#~ "áíáãíşñéóçò."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER ^_êùäéêü^_ [^_email^_]\t"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Restricted access option for %s is now OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ç SOP ëßóôá ôïõ %s åßíáé:\n"
-#~ "  Íïıìåñï  Øåõäşíõìï"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s not registered"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND channel [reason]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure founder option for %s is now OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure ops option for %s is now OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure option for %s is now OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Ïé õğçñåóßåò áäõíáôïıí íá áëëÜîïõí ôéò åğéëïãİò.  Ïé servers åßíáé óùóôÜ "
-#~ "öôéáãìİíïé?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ìİñåò, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d şñá, %d ëåğôü"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d şñá, %d ëåğôÜ"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d şñåò, %d ëåğôü"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ëåğôü, %d äåõôåñüëåğôï"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ëåğôü, %d äåõôåñüëåğôá"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Ïé õğçñåóßåò åßíáé óõíäåäåìİíåò %d ëåğôÜ, %d äåõôåñüëåğôï"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signed kick option for %s is now OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ HOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ SOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Óõãíşìç, ç õğçñåóßá ãéá ôçí åíôïëŞ VOP åßíáé åêôüò ëåéôïõñãßáò."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Óõãíşìç, ìğïñåßò ìüíï íá ÷ñçóéìïğïéŞóåéò %d AOP/SOP/VOP óôï êáíÜëé."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "ÅğéëïãŞ óõìâßùóçò åßíáé ôşñá OFF óôï êáíÜëé %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Óıíôáîç: RANDOMNEWS ADD ğåñéå÷üìåíï"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR channel what"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Óıíôáîç: OPERNEWS ADD ğåñéå÷üìåíï"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Óıíôáîç: SET DEBUG {ON | OFF | num}\n"
-#~ "\n"
-#~ "ÁëëÜæåé óå debug mode on Ş off.  Óå debug mode, üëç ç data óôİëíåôå\n"
-#~ "êáé áğü ôá Services ìİóù Üëëùí debugging\n"
-#~ "ìçíõìÜôùí ãñÜöïíôáé óå log áñ÷åßï.  Áí ôï _num_ äßíåôáé\n"
-#~ "ôï debug mode åíåñãïğïéåßôáé, ìå debugging level ñõèìéóìİíï\n"
-#~ "óôï num.\n"
-#~ "\n"
-#~ "ÁõôŞ ç åğéëïãŞ åßíáé áíôßóôïé÷ç ìå ôçí åíôïëŞ-line åğéëïãŞ\t\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Óıíôáîç åíôïëŞò: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic lock option for %s is now OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Topic retention option for %s is now OFF."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "¢ãíùóôç åíôïëŞ %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "¢ãíùóôç åğéëïãŞ %s.\n"
-#~ "ÃñÜøå /msg %s HELP KICK ãéá ğåñéóóüôåñåò ğëçñïöïñßåò."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "User %s not found in the nickserv db."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ç VOP ëßóôá ôïõ %s åßíáé:\n"
-#~ "  Íïıìåñï  Øåõäşíõìï"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Bot %s äéáãñÜöçêå."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Ôï ôåëåõôáßï ìŞíõìá ğïõ ğŞãáéíå ãéá ôïí %s áêõñşèçêå."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Your vhost of %s is now activated."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Bot %s äéáãñÜöçêå."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/language/anope.es_ES.po b/language/anope.es_ES.po
index 2c6fe0a96..b98434a95 100644
--- a/language/anope.es_ES.po
+++ b/language/anope.es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:23-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Spanish\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s para mayor informacion."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s Cambiado el nivel de DEFCON a %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s añadido a la lista de acceso de %s con nivel %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s añadido a la lista de kicks automaticos en el canal %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s añadida a  la lista de bad words de  %s."
+
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s añadido a la lista de AKILLs."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s añadido a la lista de SNLINEs."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s añadido a la lista de SQLINEs."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s añadido a la lista de SZLINEs."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s añadido a tu lista de acceso."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s añadido a tu lista de acceso."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s añadido a tu lista de acceso."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s añadido a tu lista de acceso."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "Para mayor informacion acerca de un comando especifico\n"
 "tipea /msg %s HELP comando."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s te permite crear un bot en tu propio canal.\n"
 "Esto ha sido creado para usuarios que no puedan\n"
@@ -55,8 +113,8 @@ msgstr ""
 "informacion sobre un comando especifico, tipea  \n"
 "/msg %s HELP comando."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -76,124 +134,56 @@ msgstr ""
 "tipea /msg %s HELP comando.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s es una utilidad que permite a usuarios de IRC\n"
-"enviar cortos mensajes a otros usuarios de IRC, esten\n"
-"en linea o no, o a canales(*). Ambos el nickname que\n"
-"envia y el nickname o canal destinatarios deben estar\n"
-"registrados para enviar un memo.\n"
-"\n"
-"Los comandos de %s incluyen:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s Cambiado el nivel de DEFCON a %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s añadido a la lista de acceso de %s con nivel %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s añadido a la lista de kicks automaticos en el canal %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s añadida a  la lista de bad words de  %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s añadido a la lista de AKILLs."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s añadido a la lista de SNLINEs."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s añadido a la lista de SQLINEs."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s añadido a la lista de SZLINEs."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s añadido a tu lista de acceso."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s añadido a tu lista de acceso."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ya existe en la lista de bad words de %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ya esta presente en la lista de kick automatico en el canal %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ya esta presente en la lista de AKILLs."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ya existe en la lista de SNLINEs."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ya existe en la lista de SQLINEs."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ya existe en la lista de SZLINEs."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s no puede ser tomado como veces a banear"
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s cambio tus modos de usuario."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -207,43 +197,43 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s borrado de la lista AOP de %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s borrado de la lista de acceso de %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s borrado de la lista de kicks automaticos del canal %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s borrada de la lista de bad words de %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 "%s instancias borradas de la lista de excepciones al limite de sesiones."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s borrado de la lista de AKILLs."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s borrado de la lista de SNLINEs."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s borrado de la lista de SQLINEs."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s borrado de la lista de SZLINEs."
@@ -253,71 +243,80 @@ msgstr "%s borrado de la lista de SZLINEs."
 msgid "%s deleted from your access list."
 msgstr "%s borrado de tu lista de acceso."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s borrado de tu lista de acceso."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s borrado de tu lista de acceso."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s inhabilitado(s) en el canal %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s tiene demasiados canales registrados."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s es una utilidad que permite a usuarios de IRC\n"
+"enviar cortos mensajes a otros usuarios de IRC, esten\n"
+"en linea o no, o a canales(*). Ambos el nickname que\n"
+"envia y el nickname o canal destinatarios deben estar\n"
+"registrados para enviar un memo.\n"
+"\n"
+"Los comandos de %s incluyen:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ya esta cubierto por %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s añadido a tu lista de acceso."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s no es un tipo de ban valido."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s no es un bot valido o el canal no esta registrado."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s no es un e-mail valido."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "El nick %s no esta en el canal %s actualmente."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s no encontrado en la lista ignore."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s coincide con una excepcion en %s y no puede ser baneado hasta que la "
-"excepcion haya sido removida."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -328,12 +327,12 @@ msgstr "%s movido a %s en la lista AOP."
 msgid "%s not found on %s %s list."
 msgstr "%s no encontrado en la lista AOP de %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no encontrado en la lista de acceso de %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s no encontrado en la lista de kicks automaticos en el canal %s."
@@ -343,32 +342,32 @@ msgstr "%s no encontrado en la lista de kicks automaticos en el canal %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s no encontrada en la lista de bad words de %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s no encontrado en la lista de sesion."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s no encontrado en la lista de excepciones al limite de sesiones."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s no encontrado en la lista de AKILLs."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s no encontrado en la lista de SNLINEs."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s no encontrado en la lista de SQLINEs"
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s no encontrado en la lista de SZLINEs."
@@ -378,12 +377,17 @@ msgstr "%s no encontrado en la lista de SZLINEs."
 msgid "%s not found on your access list."
 msgstr "%s no encontrado en tu lista de acceso."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s no encontrado en tu lista de acceso."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s borrado de tu lista de acceso."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -407,18 +411,12 @@ msgstr "%s sera ignorado por %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s sera ignorado permanentemente."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Noticia: todos los comandos enviados a %s son monitoreados!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Noticia: Los Servicios estan en modo read-only; Los cambios no seran "
-"salvados!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -426,11 +424,12 @@ msgstr ""
 "Recordatorio: Las mascaras AKILL no pueden contener nicks; asegurate de no "
 "haber incluido el nick en tu mascara."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Recordatorio: Solo puedes añadir mascaras IP a la lista de SZLINEs."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -482,22 +481,22 @@ msgstr "[auto-memo] El memo que enviaste ha sido leido."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER clave email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER clave email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP grupo clave"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -514,7 +513,7 @@ msgstr ""
 "u otra accion maliciosa. El Abuso de %s resultara en, a lo\n"
 "minimo, la perdida del nickname comprometido."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -527,7 +526,8 @@ msgstr ""
 "ver el acceso, AKICK, y seteos de las listas de niveles para\n"
 "cualquier canal."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -539,1009 +539,343 @@ msgstr ""
 "ver la lista de acceso para cualquier nickname\n"
 "(/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opciones : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "                 vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick del bot : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick del bot : Aun no asignado."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "              Opciones: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "  Kicker por mayusculas : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "  Kicker por mayusculas : %s (%d kick(s) para ban; minimo %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "            Caps kicker : %s (minimo %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "          Fundador: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Tipo de ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "    Kicker por negritas : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker por negritas : %s (%d kick(s) para ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kicker por flood : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kicker por flood : %s (%d kick(s) para ban; %d lineas en %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kicker por flood : %s (%d lineas en %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mascara : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "     Kicker por colores : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker por colores : %s (%d kick(s) para ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expira en: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "       Tipo de ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "  Ultima vez usado: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "      Modo de lock: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "  Kicker por repeticion : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "  Kicker por repeticion : %s (%d kick(s) para ban; %d veces)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "  Kicker por repeticion : %s (%d veces)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Sucesor: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspendido: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "  Kicker por mayusculas : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "    Kicker por negritas : %s (%d kick(s) para ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "         Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "         Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Ultimo topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "        Registrado: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (inhabilitado)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (solo el fundador)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Modifica la lista de direcciones autorizadas"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Modifica la lista de usuarios privilegiados"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Mantiene la lista de AutoKick"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Mantiene la lista de AutoKick"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Manipula la lista AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Modifica la lista de usuarios AOP"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Asigna un bot a un canal"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Mantiene lista de bad words"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr ""
-"    BANTYPE       Setea como los Servicios ponen bans\n"
-"                  en el canal"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Mantiene la lista de bots de la red"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Lista bots disponibles"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Cancela el ultimo memo que enviaste"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL all users on a specific channel"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Lista todos los records de canal"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Checks if last memo to a nick was read"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "    Creado : %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulate the DefCon system"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Borra el vhost de otro usuario."
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Borra uno o mas memos"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Borra el vhost de todos los nicks en un grupo."
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Setea la descripcion del canal"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Setea el display de tu grupo con Servicios"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Cancela la registracion de un canal"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Cancela la registracion de un nickname"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "       Descripcion: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Asocia un E-mail con tu nickname"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Modifica la lista de limite de sesion"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Previene un canal a ser usado"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Previene un nickname a ser usado"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Setea el fundador de un canal"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Recupera la clave para un nickname\n"
-"               (solo si encripcion esta desabilitada)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Envia un mensaje a todos los usuarios"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Asocia un saludo con tu nickname"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP\tSincroniza vhost en todos los nicks del grupo."
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Ingresa a un grupo"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr " Mensaje de bienvenida: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Esconde algunas partes de tu informacion"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Para identificarte con tu clave"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE\tIgnora a un usuario"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE\tIgnora a un usuario"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Displays information about your memos"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Jupiter\" un servidor"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Retiene el topic cuando el canal no\n"
-"                  esta en uso"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Configura kickers"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kickea un usuario de un canal"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Enciende o apaga la proteccion"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Setea el lenguaje con el que Servicios te\n"
-"                   enviara mensajes"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Redefine el significado de niveles de acceso"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Muestra uno o mas vhosts."
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Lista tus memos"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Define mensajes para ser mostrados a usuarios\n"
-"                al conectarse"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Cambia los modos de un canal"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Limpia los modos de un canal"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Info about a loaded module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     List loaded modules"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Un-Load a module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr ""
-"    MSG        Cambia el metodo de comunicacion con\n"
-"                    Servicios"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Temporalmente remueve todas las lineas O: de\n"
-"                un servidor remotamente"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Desactiva tu vhost asignado."
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE\tOtorga privilegios IRCOP temporarios"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Activa tu vhost asignado."
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    Define mensajes a ser mostrados a usuarios al\n"
-"                transformarse en operadores"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Envia una noticia cuando los comandos\n"
-"                  OP/DEOP son usados"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "    Opciones : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Setea la clave de tu nickname"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Regula el uso de comandos criticos"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Esconde el canal del comando LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr ""
-"    QUIT        Termina el programa de servicios sin guardar\n"
-"                los cambios"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Define mensajes para ser mostrados al azar a\n"
-"                usuarios al conectarse"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Lee uno o mas memos"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Killea otro usuario que este usando tu nickname"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Registra un nickname"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Registra un nickname"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE    Retoma custodia de tu nick luego de RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Recarga la configuracion de los Servicios"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr ""
-"    RESTART     Guarda la base de datos de los Servicios y\n"
-"                recarga los Servicios"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Restrinje el acceso al canal"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Sends a memo and requests a read receipt"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "    Kicker por inversos : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "    Kicker por inversos : %s (%d kick(s) para ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Activa las opciones de seguridad de %s"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Enciende o apaga la seguridad de nickname"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr ""
-"    SECUREFOUNDER Estricto control del estatus de fundador\n"
-"                  de canal"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Estricto control del estatus de chanop"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Envia un memo a un nick o canal"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Envia un memo a todos los usuarios registrados"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Olvidaste tu clave? Intenta esto"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Muestra la lista de sesiones de host"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Configura opciones de bots"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Setea el vhost de otro usuario."
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Setea varias opciones globales de los Servicios"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Setea opciones e informacion de un canal"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Setea protecciones, incluyendo kills"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Setea opciones relacionadas a memos"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Setea el vhost de todos los nicks en un grupo."
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr ""
-"    SHUTDOWN    Termina el programa de Servicios guardando los\n"
-"                cambios"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Firma kicks hechos con el comando KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Manipula la lista SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Modifica la lista de usuarios SOP"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Manipula la lista SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF\tMuestra la lista del staff y su status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF    Envia un memo a todos los opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Muestra estatus de los Servicios y la red"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Retorna el nivel de acceso actual de un\n"
-"               usuario en un canal"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Setea el sucesor de un canal"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Previene un canal a ser usado preservando \n"
-"               toda su informacion."
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forcefully change a user's nickname"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Manipula la lista SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr ""
-"    TOPICLOCK     El topic solo puede ser cambiado con\n"
-"                  TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE\tOtorga cambios de modos de usuario"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Libera la suspencion del canal."
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Fuerza a la base de datos de los Servicios a\n"
-"                ser updateada a disco inmediatamente"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Lista todos los records de usuarios"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Usado en : %d canal(es)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr ""
-"    XOP           Cambia el sistema de privilegios de\n"
-"                  usuario"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kicker por Bad words : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kicker por Bad words : %s (%d kick(s) para ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "      Direccion E-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "   Esta en linea desde: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Ultima vez visto: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr " Topic seteado por: %s"
@@ -1551,20 +885,6 @@ msgstr " Topic seteado por: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1575,26 +895,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1604,99 +915,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "  Nombre real : %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "     Tiempo registrado: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "  Kicker por subrayados : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "  Kicker por subrayados : %s (%d kick(s) para ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Num  De                Fecha/Hora"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Jupiter\" un servidor"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (por %s en %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (por %s en %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1715,17 +1009,12 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Comandos para %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s no es notificado por memos nuevos."
@@ -1735,34 +1024,34 @@ msgstr "%s no es notificado por memos nuevos."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (por %s en %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modulos cargados."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots disponibles."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknames en el grupo."
@@ -1773,14 +1062,14 @@ msgstr "%d nicknames en el grupo."
 msgid "%s %s list is empty."
 msgstr "La lista AOP de %s esta vacia."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista de acceso de %s esta vacia."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La lista de kicks automaticos del canal %s esta vacia."
@@ -1790,7 +1079,7 @@ msgstr "La lista de kicks automaticos del canal %s esta vacia."
 msgid "%s bad words list is empty."
 msgstr "La lista de bad words de %s esta vacia."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s no puede ser el sucesor en el canal %s ya que el es el fundador."
@@ -1800,49 +1089,48 @@ msgstr "%s no puede ser el sucesor en el canal %s ya que el es el fundador."
 msgid "%s cannot receive memos."
 msgstr "%s no puede recibir memos."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Comandos para %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr ""
-"%s La covertura es muy amplia; Por favor usa una mascara mas especifica."
+msgid "%s commands:"
+msgstr "Comandos para %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr ""
 "%s actualmente tienes %d memos, de los cuales %d aun no han sido leidos."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s actualmente tiene %d memos, de los cuales 1 aun no ha sido leido."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s actualmente tiene %d memos."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s actualmente tienes %d memos, de los cuales ninguno ha sido leido ."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s actualmente tiene 1 memo y aun no ha sido leido."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s tiene 1 memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s no tiene memos."
@@ -1852,47 +1140,27 @@ msgstr "%s no tiene memos."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s actualmente tiene muchos memos y no puede recibir mas."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s no tiene limite para memos."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s no tiene memos."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s no tiene memos nuevos."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s es %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s esta momentaneamente offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s Esta actualmente en linea. "
@@ -1914,23 +1182,23 @@ msgstr "%s esta habilitado"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s ya no es un Super-Admin."
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s no es notificado por memos nuevos."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s es notificado por memos nuevos cuando se conecta y cuando le son enviados."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s es notificado de nuevos memos cuando se conecta."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s es notificado cuando nuevos memos le son enviados."
@@ -1949,6 +1217,11 @@ msgstr ""
 "Lista AOP para %s:\n"
 "  Num  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1989,63 +1262,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) añadido a la lista de bots."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "El limite de memos para %s es %d, y no puede ser cambiado."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "El limite de memos para %s es %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL cualquier nuevo cliente que se conecte"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Fuerza Modos de Canal (%s) para ser seteado en todos los canales"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora a cualquier no-operador notificando"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill a cualquier NUEVO cliente que se conecte"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* No cambios en MLOCK"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* No nuevos registros de canales"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* No hay nuevos memos enviados"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* No nuevos registros de nicks"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Ignora a los no-operadores sin notificar"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa el reducido limite de sesion de %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<desconocido>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un massmemo ha sido enviado a todos los usuarios registrados."
 
@@ -2057,38 +1333,29 @@ msgid ""
 msgstr ""
 "Una notificacion ha sido enviada a %s informando que has leido su memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "El password ha sido enviado a %s, tipea /msg %s confirm <password> para "
 "completar el registro."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "Un vhost ident debe tener el formato de un ident valido"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Error! Un vhost solo puede contener A-Z, a-z, 0-9, '.' y '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nivel] | lista]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT canal texto"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mascara]"
@@ -2102,17 +1369,22 @@ msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-mascara] [razon]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE en %s completa; %d usuarios afectados."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL all users on a specific channel"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "La lista de AKILLS esta vacia."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2121,43 +1393,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instancia]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Acceso denegado."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nivel de acceso para %s en %s cambiada a %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nivel de acceso para %s en %s no cambiada de %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "El nivel de acceso debe ser entre %d y %d inclusive."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "El nivel de acceso no puede ser cero."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opciones del nivel de acceso para el canal %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Niveles de acceso para %s resetados a los valores originales."
@@ -2172,20 +1435,11 @@ msgstr "La lista de acceso para %s esta vacia."
 msgid "Access list for %s:"
 msgstr "Lista de acceso para %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Lista de acceso para %s:\n"
-"  Num   Niv  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista de acceso:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2194,6 +1448,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Activa las opciones de seguridad de %s"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Activa tu vhost asignado."
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2214,7 +1478,7 @@ msgstr "Nueva noticia de oper anadida (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Nueva noticia al azar anadida (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2227,22 +1491,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Todas las lineas O de %s han sido removidas."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Todas las lineas O de %s han sido reseteadas."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
@@ -2251,12 +1515,12 @@ msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 msgid "All logon news items deleted."
 msgstr "Todas las noticias de entrada borradas."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Todos los memos para el canal %s han sido borrados."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Todos tus memos han sido borrados."
 
@@ -2268,22 +1532,22 @@ msgstr "Todas las noticias de oper borradas."
 msgid "All random news items deleted."
 msgstr "Todas las noticias al azar borradas."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Todos los usuarios han sido kickeados del canal %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Todos los vhosts en el grupo %s han sido seteados a %s@%s"
@@ -2407,12 +1671,34 @@ msgstr "Habilitado para utilizar comandos de fantasia"
 msgid "Allowed to view the access list"
 msgstr "Habilitado para ver la lista de acceso"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Asigna un bot a un canal"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Asocia un saludo con tu nickname"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Asocia un E-mail con tu nickname"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista de kicks automaticos para el canal %s:"
@@ -2437,17 +1723,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Modo automatico +v"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [palabra | lista] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2466,26 +1752,26 @@ msgstr ""
 "Lista de Bad words para %s:\n"
 "  Num   Palabra                        Tipo"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "La lista de bad words esta ahora vacia."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipo de ban para el canal %s es ahora #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "El bot %s ya existe."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "El bot %s no existe."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "El bot %s ha sido asignado al canal %s."
@@ -2500,27 +1786,27 @@ msgstr "El bot %s ha sido cambiado a %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "El bot %s ha sido borrado."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s ya esta asignado al canal %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot kickeara ops en el canal %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot kickeara voices en el canal %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot no kickeara ops en el canal %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot no kickeara voices en el canal %s."
@@ -2550,16 +1836,11 @@ msgstr "Los idents de bots pueden contener solo caracteres validos."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Los nicks de bots pueden solo contener caracteres de nicks validos."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "El bot no esta en el canal %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Lista de bots:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2568,7 +1849,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2579,7 +1860,7 @@ msgstr ""
 "%d kicks al mismo usuario. Usa el comando BADWORDS\n"
 "para añadir o remover palabras."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2587,7 +1868,7 @@ msgstr ""
 "El bot ahora kickeara bad words. Usa el comando BADWORDS\n"
 "para añadir o remover palabras."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2596,11 +1877,11 @@ msgstr ""
 "El bot ahora kickeara negritas, y baneara despues de \n"
 "%d kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "El bot ahora kickeara negritas."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2611,7 +1892,7 @@ msgstr ""
 "%d caracteres y %d%% del mensaje entero), y baneara\n"
 "despues de %d kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2620,7 +1901,7 @@ msgstr ""
 "El bot ahora kickeara mayusculas (deben ser al menos\n"
 "%d caracteres y %d%% del mensaje entero)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2629,11 +1910,11 @@ msgstr ""
 "El bot ahora kickeara colores, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "El bot ahora kickeara colores."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2642,12 +1923,12 @@ msgstr ""
 "El bot ahora kickeara flood (%d lineas in %d segundos), y \n"
 "baneara despues de %d kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "El bot ahora kickeara flood (%d lineas en %d segundos)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2656,11 +1937,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2671,7 +1952,7 @@ msgstr ""
 "lo mismo), y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2680,7 +1961,7 @@ msgstr ""
 "El bot ahora kickeara repeats (usuarios que repitan %d veces\n"
 "lo mismo)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2689,11 +1970,11 @@ msgstr ""
 "El bot ahora kickeara reversos, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "El bot ahora kickeara reversos."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2702,16 +1983,16 @@ msgstr ""
 "El bot ahora kickeara subrayados, y baneara despues de %d \n"
 "kicks al mismo usuario."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "El bot ahora kickeara subrayados."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "El bot ahora kickeara colores."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2720,182 +2001,209 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "El bot ya no kickeara bad words. "
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "El bot ya no kickeara negritas."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "El bot ya no kickeara mayusculas."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "El bot ya no kickeara colores."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "El bot ya no kickeara flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "El bot ya no kickeara repeats."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "El bot ya no kickeara reversos."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "El bot ya no kickeara subrayados."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "El bot ya no kickeara mayusculas."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ      : %6d records, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservados a operadores de IRC:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes leidos   : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escritos : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR canal modos-a-limpiar"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Cancela el ultimo memo que enviaste"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Cancela la registracion de un canal"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Cancela la registracion de un nickname"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar el e-mail ahora; por favor intenta mas tarde."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Lista de bots:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "La lista de acceso para %s esta vacia."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Lista de acceso para %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ     : %6d records, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Cambiados los modos de usuario de %s."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s cambio tus modos de usuario."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "El Canal %s no existe."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr ""
+"    MSG        Cambia el metodo de comunicacion con\n"
+"                    Servicios"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Cambiados los modos de usuario de %s."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "El canal %s ha sido botado."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"El Canal %s ha sido prohibido por %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "El canal %s ya esta registrado!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s ahora prohibido."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Canal %s ahora liberado."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Canal %s ahora prohibido."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "El Canal %s no esta registrado."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "El Canal %s no puede ser registrado o usado."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "El canal %s no puede ser registrado."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "El canal %s esta registrado bajo tu nickname: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canal        : %6d records, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "El canal %s expirara."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "El canal %s no expirara."
@@ -2905,32 +2213,27 @@ msgstr "El canal %s no expirara."
 msgid "Channel %s %s list has been cleared."
 msgstr "La lista AOP de canales %s ha sido limpiada."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista de acceso para el canal %s ha sido limpiada."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La lista de kicks automaticos del canal %s ha sido limpiada."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Canal %s ahora liberado."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal no estan soportadas por tu IRCd, asi que no las puedes usar."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2938,7 +2241,7 @@ msgstr ""
 "Lista de canal:\n"
 "Nombre               Modos de Usr. Topico"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2947,7 +2250,7 @@ msgstr ""
 "Canales en los que %s tiene acceso:\n"
 "  Num  Canal                Nivel    Descripcion "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2955,16 +2258,47 @@ msgstr ""
 "Canales en los que tienes acceso:\n"
 "  Num  Canal                Nivel    Descripcion "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Checks if last memo to a nick was read"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Configura opciones de bots"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Configura kickers"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Limpia los modos de un canal"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Imposible liberar el canal %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Lista actual de AKILLs:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2972,15 +2306,15 @@ msgstr ""
 "Lista actual de AKILLs:\n"
 "  Num   Mascara                           Razon"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Lista actual de modulos:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Lista actual de SNLINEs:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2988,11 +2322,11 @@ msgstr ""
 "Lista actual de SNLINEs:\n"
 "  Num   Mascara                           Razon"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Lista actual de SQLINEs:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3000,11 +2334,11 @@ msgstr ""
 "Lista actual de SQLINEs:\n"
 "  Num   Mascara                           Razon"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Lista actual de SZLINEs:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3013,7 +2347,7 @@ msgstr ""
 "  Num   Mascara                            Razon"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Lista de excepciones al limite de sesiones actual:"
 
@@ -3037,56 +2371,61 @@ msgstr "Numero actual de SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero actual de SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Actuales usuarios: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {numero | lista | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP canal"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Desactiva tu vhost asignado."
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3211,6 +2550,47 @@ msgstr "Tiempo de expiracion por defecto de SZLINE: 1 minuto"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Tiempo de expiracion por defecto de SZLINE: Sin expiracion"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Define mensajes para ser mostrados a usuarios\n"
+"                al conectarse"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Define mensajes para ser mostrados a usuarios\n"
+"                al conectarse"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    Define mensajes a ser mostrados a usuarios al\n"
+"                transformarse en operadores"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Borra uno o mas memos"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Borra el vhost de todos los nicks en un grupo."
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Borra el vhost de otro usuario."
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3221,7 +2601,7 @@ msgstr "%d instancias borradas de la lista AOP de %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d instancias borradas de la lista de acceso de %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d instancias borradas de la lista de kicks automaticos del canal %s."
@@ -3262,7 +2642,7 @@ msgstr "%d instancias borradas de la lista de SZLINEs."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 instancia borrada de la lista de acceso de %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 instancia borrada de la lista de kicks automaticos del canal %s."
@@ -3297,33 +2677,75 @@ msgstr "1 instancia borrada de la lista de SZLINEs."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 instancia borrada de la lista AOP de %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descripcion de %s cambiada a%s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "Desactivada"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF\tMuestra la lista del staff y su status"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Todos los registros mostrados (Cuenta: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Todos los registros mostrados de %d a %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 "Todos los registro mostrados que coinciden con la clave %s (Cuenta: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Muestra uno o mas vhosts."
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3352,167 +2774,210 @@ msgstr "No uses la palabra %s en este canal!"
 msgid "Don't use underlines on this channel!"
 msgstr "No uses subrayados en este canal!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "El e-mail para %s es invalido."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametros]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Coinciden %s a %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "Activada"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Fin de la lista de %s."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Fin de la lista de acceso."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Fin de la lista de canales."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fin de la lista - %d/%d resultado(s) mostrado(s)."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la lista - %d/%d resultado(s) mostrado(s)."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Fin de la lista de usuarios."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Español"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
-msgstr "Error! El Ident es muy largo. Usa un ident con menos de %d caracteres."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
+msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Recarga la configuracion de los Servicios"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
-msgstr "Error! El vhost es muy largo. Usa un host con menos de %d caracteres."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
+msgstr ""
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Excepcion para %s (#%d) movido a la posicion %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expira en: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Tiempo de expiracion para %s cambiado."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID canal razon"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [razon]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nickname razon"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nickname [razon]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "Modo fantasia ahora Activado en el canal %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "Modo fantasia ahora Activado en el canal %s."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s ya no sera ignorado."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "La mascara %s ya esta presente en tu lista de acceso."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Fuerza a la base de datos de los Servicios a\n"
+"                ser updateada a disco inmediatamente"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forcefully change a user's nickname"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Olvidaste tu clave? Intenta esto"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "El Fundador de %s cambiado a %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Sin comodines (WildCards)!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "El comando GETPASS no esta disponible por el uso de encriptacion."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [clave]"
 
@@ -3520,11 +2985,26 @@ msgstr "GHOST nickname [clave]"
 msgid "GLOBAL message"
 msgstr "GLOBAL mensaje"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "El ghost con tu nick ha sido killeado."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE\tOtorga privilegios IRCOP temporarios"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Saludo"
 
@@ -3532,78 +3012,156 @@ msgstr "Saludo"
 msgid "Greet message displayed"
 msgstr "Mensaje de bienvenida mostrado"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Modo saludo ahora Activado en el canal %s."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Modo saludo ahora Activado en el canal %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Esconde algunas partes de tu informacion"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Esconde el canal del comando LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts con al menos %d sesiones:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY clave"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instancia]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tiempo] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Para identificarte con tu clave"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si no cambias tu nick en 20 segundos, Lo cambiare yo."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si no cambias tu nick en un minuto, Lo cambiare yo."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La lista ignore ha sido vaciada."
@@ -3612,12 +3170,13 @@ msgstr "La lista ignore ha sido vaciada."
 msgid "Ignore list is empty."
 msgstr "La lista ignore esta vacia."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Lista de bots:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3633,25 +3192,17 @@ msgstr ""
 "Tipea /msg %s HELP SET opcion para mayor\n"
 "informacion acerca de una opcion especifica."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Info about a loaded module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informacion para el bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informacion para el canal %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Tiempo de expiracion invalido."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3659,12 +3210,11 @@ msgstr ""
 "Mascara invalida. Solo mascaras reales son validas ya que excepciones no son "
 "comparadas a nicks o usernames."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
-msgstr "Password invalido. Chequea el e-mail e intenta nuevamente."
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
+msgstr ""
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3673,7 +3223,7 @@ msgstr ""
 "Limite de sesion invalido. Debe ser un entero valido mayor o igual a cero y "
 "menor a %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Valor de umbral invalido. debe ser un entero valido mayor a 1."
 
@@ -3681,12 +3231,17 @@ msgstr "Valor de umbral invalido. debe ser un entero valido mayor a 1."
 msgid "JUPE servername [reason]"
 msgstr "JUPE nombre-del-servidor [razon]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Ingresa a un grupo"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opcion {ON|OFF} [seteos]"
@@ -3695,262 +3250,445 @@ msgstr "KICK canal opcion {ON|OFF} [seteos]"
 msgid "KICK channel user reason"
 msgstr "KICK canal usuario razon"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kickea un usuario de un canal"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Killea otro usuario que este usando tu nickname"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nivel]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST patron"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST patron [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [lista | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP grupo clave"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Lenguage cambiado a Español."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ultimo memo enviado a %s fue cancelado."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ultimo mensaje quit: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ultima direccion vista: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nivel para %s en el canal %s cambiado a %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivel debe ser entre %d a %d inclusive."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Este comando es inservible en este modo."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lista de resultados concordando %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     List loaded modules"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicknames en el grupo de %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicknames en tu grupo:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Lista tus memos"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Lista todos los records de canal"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lista de nicknames en tu grupo:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Lista todos los records de usuarios"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Lista bots disponibles"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Canales locales no pueden ser registrados."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Noticia de entrada #%d borrada."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Noticia de entrada #%d no encontrada!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Noticias de entrada:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE canal modos"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO NombreArchivo"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NombreArchivo"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NombreArchivo"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NombreArchivo"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Mantiene la lista de AutoKick"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Mantiene lista de bad words"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Mantiene la lista de bots de la red"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Mantiene la lista de AutoKick"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE\tIgnora a un usuario"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Manipula la lista AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulate the DefCon system"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Manipula la lista SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Manipula la lista SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Manipula la lista SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La mascara %s ya esta presente en tu lista de acceso."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "La mascara debe ser en la forma usuario@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Matches and returns all users that registered using given "
+"email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximo  numero de usuarios: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d de %s (%s). Para borrarlo tipea: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d de %s (%s). Para borrarlo tipea: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d ha sido borrado."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de memos para %s deshabilitado."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de memos para %s seteado a %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de memos para %s seteado a 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Limite de memos muy alto; limitandolo a %d en vez."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado a %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memos para %s. Para leerlos tipea: /msg %s READ numero"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memos para %s. Para leerlos tipea: /msg %s READ numero"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Modo de mensaje"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "      Modo de lock: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE\tIgnora a un usuario"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Modifica la lista de usuarios AOP"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Modifica la lista de usuarios SOP"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Modifica la lista de direcciones autorizadas"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Modifica la lista de usuarios privilegiados"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Modifica la lista de limite de sesion"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modulo %s cargado "
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modulo %s cargado "
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modulo %s descargado"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modulo: %s Version: %s  Autor: %s cargado: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modulo: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS   : %6d records, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupos NS    : %6d records, %5d kB"
@@ -3963,11 +3701,13 @@ msgstr "Jamas expulsado por los kicks del bot"
 msgid "New memo"
 msgstr "Nuevo memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Nuevos memos para %s. Para leerlos tipea: /msg %s READ numero"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Nuevos memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 
@@ -3975,141 +3715,107 @@ msgstr "Nuevos memos para %s. Para leerlos tipea: /msg %s READ %s numero"
 msgid "News list is full!"
 msgstr "La lista de noticias esta llena!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"El nick %s ha sido prohibido por %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "El nickname %s ha sido botado."
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "El nickname %s ya esta registrado!"
+
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "El nick %ses un nickname ilegal, y no puede ser usado. "
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "El nick %s esta actualmente en uso."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "El nick %s es ahora prohibido."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "El nick %s no esta siendo ocupado."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "El nick %s no esta en uso."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "El nick %s no esta registrado."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "El nick %s no puede ser registrado o usado."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s no encontrado en la lista ignore."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "El nick %s fue reducido a %d caracteres."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "El nick %s no ha recibido ningun memo tuyo."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "El nick %s ha sido desconectado."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is currently suspended."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NO registrado. Intentalo nuevamente."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nick %s confirmado."
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "El nickname %s ha sido botado."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "El nickname %s ya esta registrado!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "El nickname %s no puede ser registrado."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "El nickname %s esta registrado bajo tu cuenta: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registrado."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Registro de Nick (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4120,26 +3826,36 @@ msgstr ""
 "automatica, en otras palabras, seran borrados despues\n"
 "de %d dias."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Modo no bot ahora Activado en el canal %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Modo no bot ahora Activado en el canal %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No hay e-mails listados para %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Sin bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "no expira"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "No existe ayuda para %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No hay informacion disponible para el modulo %s"
@@ -4154,13 +3870,13 @@ msgid "No matching entries on %s %s list."
 msgstr "No existen instancias concordantes en la lista AOP de %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "No hay instancias que concuerden en la lista de acceso de %s ."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
@@ -4173,41 +3889,45 @@ msgstr ""
 msgid "No matching entries on %s bad words list."
 msgstr "No existen palabras que concuerden en la lista de bad words de %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "No existen instancias similares en la lista de excepciones al limite de "
 "sesiones."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "No existen instancias similares en la lista de AKILLs."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "No existen instancias similares en la lista de SNLINEs."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "No existen instancias similares en la lista de SQLINEs."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "No existen instancias similares en la lista de SZLINEs."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Ningun memo pudo ser cancelado."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Actualmente no hay modulos cargados"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "No hay noticias de oper para borrar!"
@@ -4216,16 +3936,12 @@ msgstr "No hay noticias de oper para borrar!"
 msgid "No random news items to delete!"
 msgstr "No hay noticias al azar para borrar!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Sin razon."
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sin firma de kick cuando SIGNKICK LEVEL es usado"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Ninguno"
 
@@ -4233,7 +3949,7 @@ msgstr "Ninguno"
 msgid "Not allowed to join channel"
 msgstr "No es posible entrar a un canal si esta RESTRINGIDO"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4245,28 +3961,28 @@ msgstr ""
 "del canal entre en ese periodo de tiempo) sera\n"
 "automaticamente botado."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Num  Limite Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick opciones"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Noticia de OP"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4275,13 +3991,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "La informacion antigua es igual a la nueva."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "Opcion OP-notice para %s Activada."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "Opcion OP-notice para %s Activada."
 
 #: modules/core/os_news.cpp:55
@@ -4290,134 +4011,96 @@ msgid "Oper news item #%d deleted."
 msgstr "Noticia de oper #%d borrada."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Noticia de oper #%d no encontrada!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Noticias de oper:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ     : %6d records, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Una O:Line con las opciones %s ha sido agregada para %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Proteccion de Ops"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opcion %s no puede ser seteada en esta red."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "El password para %s es %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Clave aceptada - Has sido reconocido."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Autentificacion por clave requerida para ese comando.\n"
-"Intenta nuevamente despues de tipear /msg %s IDENTIFY clave."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Clave incorrecta."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La clave para %s es %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Clave incorrecta."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La clave de %s ha sido enviada."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Paz"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Opcion de paz para %s Activada."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Opcion de paz para %s Activada."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr ""
-"Por favor contactar a un Operador para que asigne un vhost a este nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Por favor intente nuevamente con una clave mas oscura.\n"
-"Las claves deben tener al menos 5 caracteres, no deben\n"
-"ser algo facil de adivinar (ej. Nombre real o Nick),\n"
-"y no pueden contener el caracter de espacio o tabulacion."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Por favor usa un nombre de servidor valido cuando use JUPE"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Por favor usar el simbolo # cuando intentes registrar un canal."
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Por favor espera %d segundos e intente nuevamente."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Por favor espera %d segundos antes de usar el comando GROUP nuevamente."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4435,63 +4118,122 @@ msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Por favor espera %d segundos antes de utilizar el comando SEND nuevamente."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Previene un canal a ser usado"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Previene un canal a ser usado preservando \n"
+"               toda su informacion."
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Previene un nickname a ser usado"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privado"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "Modo privado del bot %s esta ahora Activado."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "Modo privado del bot %s esta ahora Activado."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "Opcion de privacidad para %s Activada."
+
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now on."
 msgstr "Opcion de privacidad para %s Activada."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Proteccion"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
+#, fuzzy, c-format
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Comandos entregados: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texto|numero]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {lista | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [clave]"
 
@@ -4499,15 +4241,15 @@ msgstr "RECOVER nickname [clave]"
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descripcion"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [clave]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canal} texto-memo"
 
@@ -4517,290 +4259,368 @@ msgid "Random news item #%d deleted."
 msgstr "Noticia al azar #%d borrada."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Noticia al azar #%d no encontrada!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Noticias al Azar:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Lee uno o mas memos"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Redefine el significado de niveles de acceso"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE    Retoma custodia de tu nick luego de RECOVER"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Registra un nickname"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Regula el uso de comandos criticos"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Libera la suspencion del canal."
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Recarga la configuracion de los Servicios"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
 msgstr ""
-"El paso de registro 1 puede haber expirado. Usa \"/msg %s register "
-"<password> <email>\" primero."
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Restrinje el acceso al canal"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Acceso Restringido"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr "Acceso restringido para %s Activado."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_restricted.cpp:34
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now on."
+msgstr "Acceso restringido para %s Activado."
+
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Retiene el topic cuando el canal no\n"
+"                  esta en uso"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Recupera la clave para un nickname\n"
+"               (solo si encripcion esta desabilitada)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Retorna el nivel de acceso actual de un\n"
+"               usuario en un canal"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY canal texto"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | canal} texto"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "El comando SENDPASS no esta disponible por el uso de encriptacion."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal opcion seteos"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET canal opcion parametros"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opcion parametros"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET opcion seteo"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
@@ -4808,7 +4628,7 @@ msgstr "SET LIMIT [canal] limite"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuario | canal] {limite | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4816,24 +4636,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "La lista de SNLINEs esta vacia."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4841,16 +4661,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista}[:"
 "razon]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "La lista de SQLINEs esta vacia."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4859,54 +4679,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Clave aceptada - Has sido reconocido."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Clave aceptada - Has sido reconocido."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR El nick %s no esta online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal razon"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND canal razon"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nuevonick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "La lista de SZLINEs esta vacia."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4915,66 +4745,124 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiracion] {mascara | lista} "
 "[razon]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr ""
+"    RESTART     Guarda la base de datos de los Servicios y\n"
+"                recarga los Servicios"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Seguro"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Fundador Seguro"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Ops Seguros"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "Seguridad de fundador para %s Activada."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "Seguridad de fundador para %s Activada."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr "Seguridad de OPs para %s Activada."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
+msgstr "Seguridad de OPs para %s Activada."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Opcion de seguridad para %s Activada."
+
+#: modules/core/cs_set_secure.cpp:33
+#, fuzzy, c-format
+msgid "Secure option for %s is now on."
 msgstr "Opcion de seguridad para %s Activada."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_set_secure.cpp:36
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Seguro"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Envia un memo a un nick o canal"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF    Envia un memo a todos los opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Envia un memo a todos los usuarios registrados"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Envia un mensaje a todos los usuarios"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Envia una noticia cuando los comandos\n"
+"                  OP/DEOP son usados"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Sends a memo and requests a read receipt"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Los servicios estan deshabilitados temporalmente, por favor intenta mas "
 "tarde "
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Servicios estan ahora en DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Servicios ahora en modo expire."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Servicios ahora en modo no expire."
 
@@ -4986,7 +4874,7 @@ msgstr "Servicios ahora en modo read-only."
 msgid "Services are now in read-write mode."
 msgstr "Servicios ahora en modo de read-write."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Servicios ahora en modo debug (nivel %d)."
@@ -4999,7 +4887,7 @@ msgstr "Servicios ahora en modo debug."
 msgid "Services are now in non-debug mode."
 msgstr "Servicios ahora en modo no-debug."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Los servicios han sido configurados para no enviar e-mail"
 
@@ -5009,7 +4897,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5018,150 +4906,191 @@ msgstr ""
 "Los Servicios no han podido cambiar modos. Estan las lineas U: de tus "
 "servidores configuradas correctamente?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Servicios arriba %d dias, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Servicios arriba %d horas, %d minutos"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Servicios arriba %d minutos, %d segundos"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "El archivo de configuracion de Servicios ha sido cargado nuevamente."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Tu nick ha sido liberado por los Servicios."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limite de sesion para %s seteado a %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Limites de sesion no disponibles."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sesiones     : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sesiones  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Setea opciones e informacion de un canal"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr ""
+"    BANTYPE       Setea como los Servicios ponen bans\n"
+"                  en el canal"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Setea opciones relacionadas a memos"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Setea protecciones, incluyendo kills"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Setea la descripcion del canal"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Setea el display de tu grupo con Servicios"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Setea el fundador de un canal"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Setea el lenguaje con el que Servicios te\n"
+"                   enviara mensajes"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Setea el sucesor de un canal"
+
+#: modules/core/hs_setall.cpp:21
 #, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Setea el vhost de todos los nicks en un grupo."
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Setea el vhost de otro usuario."
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Setea varias opciones globales de los Servicios"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Setea la clave de tu nickname"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Opcion %s no conocida. Tipea /msg %s HELP LEVELS DESC para una lista de "
 "opciones validas."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "El seteo para DEBUG debe ser ON, OFF, o un numero positivo."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Seteo para NOEXPIRE debe ser ON u OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "El seteo para READONLY debe ser ON u OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Opciones para SuperAdmin deben ser ON u OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Opcion de kick firmado para %s Activada."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Muestra estatus de los Servicios y la red"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Firma kicks hechos con el comando KICK"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5170,27 +5099,33 @@ msgstr ""
 "Opcion de kick firmado para %s Activada, pero depende\n"
 "del nivel del usuario que use el comando."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Opcion de kick firmado para %s Activada."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Opcion de kick firmado para %s Activada."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Kicks Firmados"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Lo siento, RSEND ha sido deshabilitado en esta red."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Lo siento, el asignamiento de bots esta temporalmente inhabilitado."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Lo siento, la creacion de bot ha fallado"
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Lo siento, la modificacion de bots esta temporalmente inabilitada."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones para bot esta temporalmente inhabilitado"
@@ -5203,7 +5138,7 @@ msgstr ""
 "Lo siento, la modificacion de la lista AOP de canales esta\n"
 "temporalmente deshabilitada."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la modificacion de acceso a canales esta temporalmete "
@@ -5215,71 +5150,47 @@ msgstr ""
 "Lo siento, la modificacion de kicks automaticos en canales esta "
 "temporalmente deshabilitada."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la lista de  bad words para canales esta temporalmente "
 "inabilitada."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Lo siento, la de-registracion de canales esta temporalmente desabilitada."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-"Lo siento, el seteo de opciones de canales esta temporalmente deshabilitado."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Lo siento, el registro de canales esta temporalmente deshabilitado."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Lo siento, la identificacion ha fallado."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Lo siento, la configuracion de kicker esta temporalmente inabilitada."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Lo siento, el seteo de opciones para memos esta temporalmente inhabilitado."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Lo siento, el envio de memos esta temporalmente inhabilitado."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 "Lo siento, la de-registracion de nicknames esta temporalmente inabilitada."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Lo siento, La agrupacion de nicks esta temporalmente deshabilitada."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-"Lo siento, el seteo de opciones para nicknames esta temporalmente "
-"deshabilitado."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Lo siento, el registro de nicknames esta temporalmente deshabilitado."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Lo siento, fallo en el registro."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5293,13 +5204,13 @@ msgstr ""
 "Lo siento, solo puedes tener %d instancias en tu lista de acceso por "
 "nickname."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Lo siento, solo puedes tener %d instancias de acceso en un determinado canal."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
@@ -5310,21 +5221,18 @@ msgstr ""
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Lo siento, solo puedes tener %d bad words en un canal."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Lo siento, has sobrepasado tu limite de %d canales."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Lo siento, has alcanzado tu limite de %d canales."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr ""
+"Lo siento, solo puedes tener %d instancias en tu lista de acceso por "
+"nickname."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Estadisticas reseteadas."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Estado actualizado (memos, vhost, chmodes, flags)."
 
@@ -5336,12 +5244,24 @@ msgstr "Para de floodear!"
 msgid "Stop repeating yourself!"
 msgstr "Para de repetir!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr ""
+"    SECUREFOUNDER Estricto control del estatus de fundador\n"
+"                  de canal"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Estricto control del estatus de chanop"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Sucesor de %s eliminado."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Sucesor de %s cambiado a %s."
@@ -5350,21 +5270,36 @@ msgstr "Sucesor de %s cambiado a %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Simbiosis"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Modo Simbiosis ahora Activado en el canal %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Modo Simbiosis ahora Activado en el canal %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP\tSincroniza vhost en todos los nicks del grupo."
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintaxis: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5392,7 +5327,7 @@ msgstr ""
 "2: ban en la forma *!*@host\n"
 "3: ban en la forma *!*usuario@*.dominio"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5405,7 +5340,7 @@ msgstr ""
 "Setea la descripcion para el canal, la que es mostrada\n"
 "con los comandos LIST y INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5418,7 +5353,7 @@ msgstr ""
 "Cambia el fundador de un canal. El nuevo nickname debe\n"
 "ser uno registrado."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5438,7 +5373,7 @@ msgstr ""
 "salga del canal, y sera restorado la proxima vez que\n"
 "el canal sea creado."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5455,7 +5390,7 @@ msgstr ""
 "al usuario del canal cuando los comandos OP o DEOP sean\n"
 "usados para un usuario en el canal."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5473,7 +5408,7 @@ msgstr ""
 "de un usuario con nivel igual o superior a el via\n"
 "comandos de %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5518,7 +5453,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5532,7 +5468,7 @@ msgstr ""
 "Cuando privacidad esta seteada, un /msg %s LIST no\n"
 "incluira el canal en ninguna lista."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5547,7 +5483,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5567,7 +5503,7 @@ msgstr ""
 "otorgados acceso al canal controlado por la lista de\n"
 "acceso."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5586,7 +5522,7 @@ msgstr ""
 "su fundador y su sucesor, y no aquellos que esten identificados\n"
 "con %s."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5609,7 +5545,24 @@ msgstr ""
 "si no hubiese un sucesor. El nuevo nickname debe ser uno\n"
 "registrado."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintaxis: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Abilita o desabilita la opcion de fijacion de topic\n"
+"para un canal. Cuando la fijacion de topic esta\n"
+"seteada, %s no permitira que el topico del canal\n"
+"sea cambiado excepto con el comando TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5654,8 +5607,8 @@ msgstr ""
 "Cambiar de listas xOP al sistema de listas de acceso no causa\n"
 "problema alguno."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5745,7 +5698,7 @@ msgstr ""
 "El comando ACCESS CLEAR limpia todas las instancias\n"
 "de la lista de acceso."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5794,7 +5747,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Muestra la lista de acceso actual."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5806,7 +5759,7 @@ msgstr ""
 "Hace al bot hacer el equivalente del comando \"/me\"\n"
 "en el canal dado usando el texto dado."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5826,7 +5779,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5850,7 +5803,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5908,7 +5861,7 @@ msgstr ""
 "El comando AKICK CLEAR limpia todas las instancias\n"
 "de ka lista de akicks."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -6003,7 +5956,7 @@ msgstr ""
 "\n"
 "Limitado a Operadores de Servicios."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6043,7 +5996,7 @@ msgstr ""
 "Canales que tengan la opcion NOEXPIRE seteada seran precedidos\n"
 "por un signo de exclamacion."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6061,7 +6014,7 @@ msgstr ""
 "acceso igual o mayor a level.\n"
 "Su uso esta limitado a administradores de Servicios."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6091,17 +6044,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxis: AOP canal ADD nick\n"
 "          AOP canal DEL {nick | instancia | lista}\n"
@@ -6146,7 +6088,7 @@ msgstr ""
 "de acceso y /msg %s HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6160,8 +6102,8 @@ msgstr ""
 "Luego de esto puedes configurar al bot para acomodarlo\n"
 "a tus necesidades."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6182,20 +6124,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Sintaxis: BADWORDS canal ADD palabra [SINGLE | START | END]\n"
 "          BADWORDS canal DEL {palabra | numero | lista}\n"
@@ -6234,7 +6162,7 @@ msgstr ""
 "El comando BADWORDS CLEAR limpia todas las instancias\n"
 "de la lista de bad words."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6250,7 +6178,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6292,7 +6220,7 @@ msgstr ""
 "este registrado. Si un usuario no registrado esta usando \n"
 "el nick, sera killeado.\t"
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6302,7 +6230,7 @@ msgstr ""
 "\n"
 "Lista todos los bots disponibles en esta red."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6315,7 +6243,21 @@ msgstr ""
 "siempre y cuando no haya sido leido al momento en el que\n"
 "usaste el comando."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6327,7 +6269,7 @@ msgstr ""
 "usa el entero, completo y real ident@host para cada nick,\n"
 "entonces ejecuta el AKILL. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6350,7 +6292,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6361,7 +6303,7 @@ msgstr ""
 "Verifica que el _ultimo_ memo que enviaste a nick haya sido leido.\n"
 " Nota que esto solo funciona para nicknames, no para canales."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6376,7 +6318,7 @@ msgstr ""
 "\n"
 "Limitado a aquellos con nivel de fundador en el canal."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6386,16 +6328,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6412,7 +6367,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6424,7 +6379,7 @@ msgstr ""
 "pre-definido de restricciones que son muy utiles en un eventual\n"
 "ataque a la red."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6446,7 +6401,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a HOPs o aquellos con\n"
 "nivel 4 y mayor para quitarse halfop a si mismos."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6456,7 +6411,7 @@ msgstr ""
 "Borra el vhost asignado al nick dado de la base de datos.\n"
 "Limitado a Operadores de Servicios."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6493,7 +6448,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Borra los memos enumerados 2 a 5 y 7 a 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6505,7 +6460,7 @@ msgstr ""
 "nick dado.\n"
 "Limitado a Host Removers."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6525,7 +6480,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6544,7 +6499,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6564,7 +6519,7 @@ msgstr ""
 "con nivel 10 y mayor en el canal para desprotejerse a\n"
 "si mismos."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6586,7 +6541,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a VOPs o aquellos con\n"
 "nivel 3 y mayor para darse voice a si mismos."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6598,7 +6553,7 @@ msgstr ""
 "Desregistra el canal dado. Solo puede ser usado por el\n"
 "fundador del canal."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6611,8 +6566,8 @@ msgstr ""
 "administradores de Servicios pueden botar un\n"
 "canal por el cual no se hayan identificado."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6642,7 +6597,7 @@ msgstr ""
 "Antes de usar este comando debes identificarte con tu\n"
 "clave (/msg %s HELP IDENTIFY para mayor informacion)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6665,7 +6620,7 @@ msgstr ""
 "privilegios especiales. Botar cualquier nick esta\n"
 "limitado a administradores de Servicios."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6750,7 +6705,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6768,7 +6723,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6786,7 +6741,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6800,7 +6755,7 @@ msgstr ""
 "sea que el comando se use, un mensaje incluyendo la persona que uso\n"
 "el comando y el email sera logeado."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6810,7 +6765,7 @@ msgstr ""
 "\n"
 "Retorna la key del canal dado."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6831,7 +6786,7 @@ msgstr ""
 "\n"
 "Este comando no esta disponible si encripcion esta habilitada."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6863,7 +6818,7 @@ msgstr ""
 "grupo de ese nick, o debes proveer la clave correcta\n"
 "para ese nickname."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6873,7 +6828,7 @@ msgstr ""
 "\n"
 "Lista todos los nicks en tu grupo."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6906,7 +6861,7 @@ msgstr ""
 "Permite a los Administrators a enviar mensajes a los usuarios\n"
 "en la red. El mensaje sera enviado desde el nick %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6920,7 +6875,8 @@ msgstr ""
 "nick actual para ser el vhost para todos los nicks en el\n"
 "mismo grupo."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6984,7 +6940,7 @@ msgstr ""
 "Ten en cuenta: todos los nicks en un grupo comparten la\n"
 "misma clave."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7005,7 +6961,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a HOPs o aquellos con nivel\n"
 "4 y mayor para darse halfop a si mismos."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7034,16 +6990,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxis: HOP canal ADD nick\n"
 "          HOP canal DEL {nick | instancia | lista}\n"
@@ -7085,7 +7031,7 @@ msgstr ""
 "de acceso y /msg %s HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7103,7 +7049,7 @@ msgstr ""
 "comando antes de usarlos. La clave deberia ser la misma\n"
 "que enviaste con el comando REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7113,7 +7059,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7146,7 +7092,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7167,7 +7113,7 @@ msgstr ""
 "Por defecto, la opcion ALL esta limitada a aquellos\n"
 "con acceso de fundador en el canal."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7184,7 +7130,7 @@ msgstr ""
 "ALL, podras ver toda la informacion; independiente de\n"
 "si esta oculta o no."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7200,7 +7146,7 @@ msgstr ""
 "puedes recibir. Con un parametro, muestra la misma\n"
 "informacion para el canal dado."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7227,7 +7173,7 @@ msgstr ""
 "informacion para el nickname dado. Este uso esta\n"
 "limitado a administradores de Servicios."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7246,7 +7192,7 @@ msgstr ""
 "recibiras informacion acerca de un bot, tal como tiempo\n"
 "de creacion o numero de canales en los que este."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7291,7 +7237,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7307,7 +7253,8 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7334,7 +7281,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7356,8 +7303,8 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7426,7 +7373,7 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7444,7 +7391,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7462,7 +7409,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7491,7 +7438,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7510,7 +7457,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7533,7 +7480,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7549,7 +7496,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7568,7 +7515,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7587,7 +7534,7 @@ msgstr ""
 "antes de ser baneado. No des ttb para desabilitar\n"
 "el sistema de ban una vez activado."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7639,7 +7586,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7664,7 +7611,7 @@ msgstr ""
 "de items a mostrar al operador 1 vez.\n"
 "Limitado a Operadores de Servicios."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7679,7 +7626,7 @@ msgstr ""
 "dado (Canales con la opcion PRIVATE seteada no son\n"
 "listados.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7719,7 +7666,7 @@ msgstr ""
 "        Lista todos los nicks registrados por usuarios en el\n"
 "        dominio bar.org."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7777,7 +7724,7 @@ msgstr ""
 "        Lista todos los nicks registrados que hayan sido seteados\n"
 "        a no expiracion."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7800,11 +7747,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Lista memos enumerados 2 a 5 y 7 a 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintaxis: LOGONNEWS ADD texto"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7837,7 +7794,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintaxis: LOGONNEWS DEL {numero | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7853,7 +7810,7 @@ msgstr ""
 "Ten en cuenta que no te sera requerido identificarte\n"
 "nuevamente."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7877,24 +7834,7 @@ msgstr ""
 "dado nick a reidentificarse. Este uso esta limitado a\n"
 "administradores de Servicios."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintaxis: MODE canal modos\n"
-"\n"
-"Permite a los operadores de Servicios setear modos de canal\n"
-"para cualquier canal. Parametros son los mismos que para el\n"
-"comando estandart /MODE.\n"
-"\n"
-"Limitado a operadores de Servicios."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7921,7 +7861,24 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Sintaxis: MODE canal modos\n"
+"\n"
+"Permite a los operadores de Servicios setear modos de canal\n"
+"para cualquier canal. Parametros son los mismos que para el\n"
+"comando estandart /MODE.\n"
+"\n"
+"Limitado a operadores de Servicios."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7930,7 +7887,7 @@ msgstr ""
 "Sintaxis: MODINFO NombreArchivo\n"
 "Este comando lista informacion sobre el modulo cargado pedido "
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7939,7 +7896,7 @@ msgstr ""
 "Sintaxis: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lista todos los modulos actualmente cargados."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7950,7 +7907,7 @@ msgstr ""
 "Este comando carga el modulo llamado NombreArchivo del directorio de \n"
 "modulos."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7961,7 +7918,7 @@ msgstr ""
 "Este comando carga el modulo llamado NombreArchivo del directorio de \n"
 "modulos."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7972,7 +7929,7 @@ msgstr ""
 "Este comando descarga el modulo llamado NombreArchivo del directorio \n"
 "de modulos."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -8003,7 +7960,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8015,7 +7972,7 @@ msgstr ""
 "Cuando uses este comando cualquier usuario que haga un /whois\n"
 "a ti vera tu IP real."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8031,7 +7988,7 @@ msgstr ""
 "opciones simplemente tipear un \"-\" en vez de cualquier\n"
 "opcion."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8043,7 +8000,7 @@ msgstr ""
 "Cuando uses este comando cualquier usuario que haga un /whois\n"
 "a ti vera el vhost asignado en vez de tu IP real."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8067,7 +8024,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintaxis: OPERNEWS ADD texto"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8100,7 +8057,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintaxis: OPERNEWS DEL {numero | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8119,7 +8076,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel de\n"
 "acceso 5 y mayor en el canal."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8140,7 +8097,7 @@ msgstr ""
 "con nivel 10 y mayor en el canal para protejerse a si\n"
 "mismos."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8169,16 +8126,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8217,7 +8164,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8241,7 +8188,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintaxis: RANDOMNEWS ADD texto"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8267,7 +8214,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintaxis: RANDOMNEWS DEL {numero | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8292,7 +8239,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Muestra los memos enumerados 2 a 5 y 7 a 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8340,8 +8288,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8382,8 +8330,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8449,7 +8397,7 @@ msgstr ""
 "informacion acerca de esta caracteristica, tipea /msg %s\n"
 "HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8478,7 +8426,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8496,7 +8444,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8508,7 +8456,7 @@ msgstr ""
 "Este comando envia el codigo de autorizacion (conocido como passcode)\n"
 "a la direccion e-mail del usuario que lo esta ejecutando."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8535,7 +8483,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8556,7 +8504,7 @@ msgstr ""
 "Una vez que el memo ha sido leido, quien envio el memo recibira una \n"
 "notificacion automatica informando que el memo ha sido leido.\t"
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8567,7 +8515,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8582,7 +8530,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8594,7 +8542,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8604,7 +8552,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8620,7 +8568,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8643,7 +8591,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8676,24 +8624,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8707,7 +8638,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8719,7 +8650,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8730,7 +8661,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8749,7 +8680,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8772,7 +8703,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8782,7 +8713,7 @@ msgstr ""
 "\n"
 "Hace al bot decir el texto dado en el canal dado."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8799,7 +8730,7 @@ msgstr ""
 "recibira noticia de que el/ella tiene un nuevo memo. El nick\n"
 "o canal recipientes deben estar registrados."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8809,7 +8740,7 @@ msgstr ""
 "Sintaxis: SENDALL texto-memo\n"
 "Envia a todos los usuarios registrados un memo conteniendo texto-memo."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8828,7 +8759,7 @@ msgstr ""
 "Puede ser limitado a operadores de IRC en ciertas\n"
 "redes."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8864,7 +8795,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8878,7 +8809,7 @@ msgstr ""
 "setea idents para usuarios ademas de vhosts.\n"
 "Limitado a operadores de Servicios."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8894,8 +8825,8 @@ msgstr ""
 "que no estab en la lista de usuarios no seran permitidos a\n"
 "obtener el status de operador de canal."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8919,26 +8850,9 @@ msgstr ""
 "igual al nivel SIGNKICK en el canal no tendran sus kicks \n"
 "firmados. Ver /msg %s HELP LEVELS para mayor informacion."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintaxis: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Abilita o desabilita la opcion de fijacion de topic\n"
-"para un canal. Cuando la fijacion de topic esta\n"
-"seteada, %s no permitira que el topico del canal\n"
-"sea cambiado excepto con el comando TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8971,7 +8885,7 @@ msgstr ""
 "Notese: el acceso a este comando esta controlado por\n"
 "el nivel SET."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8985,7 +8899,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9001,7 +8915,7 @@ msgstr ""
 "\n"
 "Opciones disponibles:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9016,7 +8930,7 @@ msgstr ""
 "kickeados por el bot, incluso si no concuerdan con\n"
 "el nivel NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9031,7 +8945,7 @@ msgstr ""
 "kickeados por el bot, incluso si no concuerdan con\n"
 "el nivel NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9064,7 +8978,7 @@ msgstr ""
 "usar !op, el usuario debe tener suficiente\n"
 "acceso para el nivel OPDEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9081,7 +8995,7 @@ msgstr ""
 "siempre y cuando tengan el suficiente acceso\n"
 "al canal."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9096,7 +9010,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9112,7 +9026,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9126,7 +9040,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9144,8 +9058,8 @@ msgstr ""
 "canales, tal como MODOS, KICKS e incluso los\n"
 "mensajes de entrada."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9171,7 +9085,7 @@ msgstr ""
 "Tipea /msg %s HELP SET opcion para mas informacion\n"
 "acerca de una opcion especifica."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9182,7 +9096,7 @@ msgstr ""
 "Setea varias opciones para nicknames. opcion puede ser\n"
 "una de:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9208,7 +9122,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9220,7 +9134,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9233,7 +9147,7 @@ msgstr ""
 "nicks en Servicios. El nuevo display DEBE ser un nick\n"
 "de tu grupo."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9247,7 +9161,7 @@ msgstr ""
 "sera mostrada cuando alguien requiera informacion \n"
 "sobre el canal con el comando INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9263,7 +9177,7 @@ msgstr ""
 "opcion GREET abilitada, siempre y cuando tengas en el\n"
 "el acceso necesario."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9286,7 +9200,7 @@ msgstr ""
 "El segundo parametro especifica si la informacion debe ser\n"
 "escondida (OFF) o mostrada (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9319,7 +9233,7 @@ msgstr ""
 "necesario. Ademas, los administradores de la red pueden haber\n"
 "deshabilitado esta opcion."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9336,7 +9250,7 @@ msgstr ""
 "numero debe ser elejido de la lista de lenguajes\n"
 "soportados:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9353,7 +9267,7 @@ msgstr ""
 "enviarte memos. Ademas, no puedes setear el limite mas\n"
 "alto que %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9395,7 +9309,7 @@ msgstr ""
 "limite, no pueden setear el limite mas alla de %d, y no\n"
 "pueden setear un limite hard."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9404,7 +9318,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9418,7 +9332,7 @@ msgstr ""
 "comunicaran contigo. Con MSG seteado, los Servicios\n"
 "usaran msgs, de otra forma usaran notices. "
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9437,7 +9351,7 @@ msgstr ""
 "Esta opcion es equivalente a la opcion -noexpire\n"
 "en la linea de comando."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9474,7 +9388,7 @@ msgstr ""
 "\n"
 "ON es escencialmente LOGON y NEW combinados."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9486,7 +9400,7 @@ msgstr ""
 "Cambia la clave usada para identificarte como el\n"
 "dueño del nick."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9505,7 +9419,7 @@ msgstr ""
 "(Sin embargo, cualquier persona que sepa tu nick podra chequear\n"
 "tu informacion usando el comando INFO.)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9536,7 +9450,7 @@ msgstr ""
 "Esta opcion es equivalente a la opcion -readonly en\n"
 "la linea de comando."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9558,7 +9472,7 @@ msgstr ""
 "acceso, %s no te auto-killeara no importando el seteo de la opcion\n"
 "KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9572,7 +9486,7 @@ msgstr ""
 "Esta opcion no es persistente y debe ser usada solo de ser\n"
 "necesario."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9592,7 +9506,7 @@ msgstr ""
 "agregado al grupo despues que este comando haya sido usado.\n"
 "Limitado a Operadores de Servicios."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9605,7 +9519,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9704,7 +9618,7 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9734,16 +9648,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxis: SOP canal ADD nick\n"
 "          SOP canal DEL {nick | instancia | lista}\n"
@@ -9786,7 +9690,7 @@ msgstr ""
 "de acceso y /msg %s HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9887,7 +9791,7 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9897,7 +9801,7 @@ msgstr ""
 "Muestra todos los nicks de Services Staff, junto con su nivel\n"
 "y estado on-line."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9907,7 +9811,7 @@ msgstr ""
 "Sintaxis: STAFF texto-memo\n"
 "Envia a todo el staff de services un memo conteniendo texto-memo."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9951,7 +9855,7 @@ msgstr ""
 "La opcion RESET resetea la cuenta maxima de usuarios\n"
 "al numero de usuarios actualmente presentes en la red."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9977,7 +9881,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10022,7 +9926,7 @@ msgstr ""
 "resto seran ingnorados. Si no se entrega un nickname, se mostrara\n"
 "tu estado."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10042,7 +9946,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10052,7 +9956,7 @@ msgstr ""
 "\n"
 "Cambia, a la fuerza, el nick del usuario from nick a nuevonick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10148,7 +10052,8 @@ msgstr ""
 "\n"
 "Limitado a operadores de Servicios."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10172,21 +10077,7 @@ msgstr ""
 "Por defecto, limitado a aquellos con nivel de fundador\n"
 "en el canal."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintaxis: UMODE usuario modos\n"
-"\n"
-"Permite a Services Operators a setear modos de\n"
-"usuarios para cualquier usuario. Los parametros son los\n"
-"mismos que para el comando /MODE."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10204,7 +10095,7 @@ msgstr ""
 "reasignar un bot luego sin tener que configurarlo\n"
 "completamente."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10223,7 +10114,7 @@ msgstr ""
 "Por defecto, limitado a AOPs o aquellos con nivel 5\n"
 "y mayor en el canal."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10240,7 +10131,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10254,7 +10145,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10268,7 +10159,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10293,7 +10184,7 @@ msgstr ""
 "\n"
 "Limitado a administradores de Servicios."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10316,7 +10207,7 @@ msgstr ""
 "acceso 5 y mayor en el canal, o a VOPs o aquellos\n"
 "con nivel 3 y mayor para darse voice a si mismos."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10345,16 +10236,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxis: VOP canal ADD nick\n"
 "          VOP canal DEL {nick | instancia | lista}\n"
@@ -10397,7 +10278,7 @@ msgstr ""
 "de acceso y /msg %s HELP SET XOP para saber como cambiar\n"
 "entre la lista de acceso y el sistema de listas xOP."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10413,7 +10294,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10421,7 +10302,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10429,7 +10310,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10441,51 +10322,100 @@ msgstr ""
 "setea, si es necesario, los modos de canales (ModeonID)\n"
 "y actualiza tu vhost y tus userflags (lastseentime, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [topico]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Temporalmente remueve todas las lineas O: de\n"
+"                un servidor remotamente"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr ""
+"    SHUTDOWN    Termina el programa de Servicios guardando los\n"
+"                cambios"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr ""
+"    QUIT        Termina el programa de servicios sin guardar\n"
+"                los cambios"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "La opcion IMMED no esta disponible en esta red."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "La lista de AKILLs ha sido limpiada."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "El Nivel de Defcon esta ahora a Nivel: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "La lista de SNLINEs ha sido limpiada."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "La lista de SQLINEs ha sido limpiada."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "La lista de SZLINEs ha sido limpiada."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "El canal %s no tiene clave."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10497,89 +10427,79 @@ msgstr ""
 "y NOJOIN son niveles maximos, mientras todos los otros\n"
 "son niveles minimos."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "El host %s actualmente tiene %d sesiones con un limite de %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "El ultimo memo que enviaste a %s (enviado el %s) ha sido leido."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "El ultimo memo que enviaste a %s (enviado el %s) aun no ha sido leido."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "El limite de memos para %s no puede ser cambiado."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "El nuevo display es ahora %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "El nick %s esta siendo cambiado a %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Hay %d memos en el canal %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10587,7 +10507,8 @@ msgstr ""
 "No hay bots disponibles en este momento.\n"
 "Pidele a un administrador de servicios que cree uno!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10597,20 +10518,12 @@ msgstr ""
 "Tipea /msg %s HELP GLIST y /msg %s HELP DROP\n"
 "para mayor informacion."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Hay %d memo en el canal %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Hay un memo nuevo en el canal %s.\n"
-"Tipea /msg %s READ %s %d para leerlo."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Ya no hay un bot asignado a %s."
@@ -10631,7 +10544,7 @@ msgstr "No hay Noticias al azar."
 msgid "There's no email address set for your nick."
 msgstr "Tu nick no tiene una direccion de e-mail."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10649,81 +10562,38 @@ msgstr ""
 "                        por alguien mas que un operador\n"
 "                        de IRC"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Este canal ha sido prohibido."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Este canal ha sido registrado con %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Este canal ha sido suspendido."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Este canal esta prohibido."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Este canal no expirara."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr "Este nick ya ha sido pedido, chequea tu e-mail para el password."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Este nick esta esperando una verificacion por e-mail antes de poder "
-"completar el registro."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Este nick pertenece a otra persona. Por favor elige otro nick.\n"
-"(Si este es tu nick, tipea /msg %s IDENTIFY clave.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Este nick ha sido registrado; No puedes usarlo."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Este nick esta registrado y protegido. Si es tu\n"
-"nick, tipea /msg %s IDENTIFY clave. Si no,\n"
-"por favor elige un nick diferente."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Este nickname no expirara."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Este nickname no puede ser usado. Por favor elige otro."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Este nickname no expirara."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10731,30 +10601,64 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr ""
+"    XOP           Cambia el sistema de privilegios de\n"
+"                  usuario"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Lock de topic"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Retencion de Topic"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr ""
+"    TOPICLOCK     El topic solo puede ser cambiado con\n"
+"                  TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Lock de topic para %s Activado."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Lock de topic para %s Activado."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr "Retencion de topic para %s Activada."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Retencion de topic para %s Activada."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Apaga las mayusculas!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Enciende o apaga la seguridad de nickname"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Enciende o apaga la proteccion"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10768,7 +10672,8 @@ msgstr ""
 "    de acceso en el canal puede leer los memos del canal. Esto\n"
 "    puede ser cambiado con el comando %s LEVELS."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10778,7 +10683,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10786,7 +10692,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10794,130 +10701,130 @@ msgstr ""
 "Tipea /msg %s HELP opcion para mayor informacion\n"
 "acerca de una opcion en particular."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Tipea /msg %s SET EMAIL e-mail para setear tu e-mail.\n"
-"Respetamos tu privacidad; este e-mail no sera entregado\n"
-"a ninguna persona."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Tipea /msg %s LIST NEW para listar tus memos."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Tipea /msg %s READ %d para leerlo."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Tipea /msg %s READ LAST para leer tu ultimo memo."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modos"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Tipea /msg %s SET EMAIL e-mail para setear tu e-mail.\n"
+"Respetamos tu privacidad; este e-mail no sera entregado\n"
+"a ninguna persona."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Un-Load a module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Imposible cargar modulo %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Imposible quitar modulo %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Opcion SET desconocida %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opcion STATS %s desconocida."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Comando no conocido %s. \"/msg %s HELP\" para ayuda."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Caracter de modo %c desconocido e ignorado."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opcion %s desconocida."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Opcion %s desconocida.\n"
-"Tipea /msg %s HELP SET para mayor informacion."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Updateando las bases de datos."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuario      : %6d records, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"El usuario que ocupaba tu nick ha sido killeado.\n"
-"/msg %s RELEASE %s para recuperarlo antes de %s."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "Usuario coincide con el except del canal."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10925,16 +10832,35 @@ msgstr ""
 "Lista de usuarios:\n"
 "Nick                 Mascara"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "El Fundador de %s cambiado a %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Muestra la lista de sesiones de host"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Proteccion de Voices"
 
@@ -10960,16 +10886,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Cuida tu lenguaje!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ya eres miembro del grupo de %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Ya estas identificado."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10978,11 +10904,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Ya no eres un SuperAdmin."
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "No estas autorizado a estar en este canal."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autorizado a cambiar tu limite de memos."
 
@@ -10990,11 +10912,12 @@ msgstr "No estas autorizado a cambiar tu limite de memos."
 msgid "You are now a SuperAdmin"
 msgstr "Ahora eres un SuperAdmin."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Eres ahora un operador de IRC."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -11002,41 +10925,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Ahora eres miembro en el grupo de %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "No puedes pedir una notificacion cuando te envias el memo a ti mismo."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "No puedes ghostearte a ti mismo!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "No puedo desconectar a  %s porque es un administrador de servicios."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "No puedes recuperarte a ti mismo!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11046,7 +10970,8 @@ msgstr ""
 "Usa los comandos AOP, SOP y VOP en vez.\n"
 "Tipea /msg %s HELP comando para mayor informacion."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11057,6 +10982,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11064,56 +10990,66 @@ msgstr ""
 "No puedes usar este comando. Usa el comando ACCESS en su lugar.\n"
 "Tipea /msg %s HELP ACCESS para mayor informacion."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "No puedes setear el limite de memos para %s mayor a %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "No puedes setear tu limite de memos mayor a %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "No puedes no setear tu direccion e-mail en esta red."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Tienes %d memos, de los cuales %d aun no han sido leidos."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Tienes %d memos, de los cuales 1 aun no ha sido leido."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Tienes %d memos."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Tienes %d memos, ninguno de ellos leido."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Tienes 1 memo y aun no ha sido leido."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Tienes 1 memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "No tienes memos."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11123,62 +11059,43 @@ msgstr "Tienes %d memos nuevos."
 msgid "You have 1 new memo."
 msgstr "Tienes 1 memo nuevo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Tienes un nuevo memo de %s.\n"
-"Tipea /msg %s READ %d para leerlo."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Has sido desbaneado de %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "No tienes limite en el numero de memos que puedes mantener."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "No tienes memos."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "No tienes memos nuevos."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Debes ingresar un numero valido como tiempo."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Debes asignar un bot al canal antes de poder usar este comando.\n"
-"Tipea /msg %s HELP ASSIGN para mayor informacion."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Debes ser un operador de canal para registrar el canal."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Debes ser un operador de canal para registrar el canal."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "Debes estar conectado mas de %d segundos para registrar tu nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11188,25 +11105,25 @@ msgstr ""
 "Este e-mail te permitira recuperar tu clave en\n"
 "caso que la olvides."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Seras notificado por nuevos memos cuando te conectes y en cuanto te sean "
 "enviados."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Seras notificado por memos nuevos en cuanto te conectes."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Seras notificado cuando los memos nuevos te sean enviados."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "No te sera posible recibir mas memos."
 
@@ -11214,7 +11131,7 @@ msgstr "No te sera posible recibir mas memos."
 msgid "You will no longer be informed via email."
 msgstr "No seras informado de nuevos memos via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "No seras notificado por memos nuevos."
 
@@ -11222,18 +11139,20 @@ msgstr "No seras notificado por memos nuevos."
 msgid "You will now be informed about new memos via email."
 msgstr "Seras informado de nuevos memos via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Tu IRCD no soporta vIdent's. Si esto es incorrecto, por favor reportalo como "
-"un posible bug."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Tu lista de acceso esta vacia."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Ya estas identificado."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11249,35 +11168,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Tu lista de acceso esta vacia."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Todas las lineas O de %s han sido removidas."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "La lista ignore esta vacia."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Tu limite de memos ha sido deshabilitado."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Tu limite de memos ha sido seteado a %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Tu limite de memos es %d y no puede ser cambiado."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Tu limite de memos es %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Tu limite de memos es 0; No recibiras nuevos memos."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11285,61 +11225,57 @@ msgstr ""
 "Tu limite de memos es 0; No recibiras nuevos memos. No puedes cambiar este "
 "limite."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Tu nick ha sido desconectado."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Tu nick ya esta registrado; tipea /msg %s DROP primero."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Tu nick no esta registrado."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Tu nickname ha sido botado."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Tu nickname esta siendo cambiado a %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Tu password ha sido enviado nuevamente a %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Tu clave es %s - Recuerdala para uso futuro."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Tu vhost %s ha sido activado."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Tu vhost %s@%s ha sido activado."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11358,94 +11294,95 @@ msgstr "[Noticias de Oper - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Noticias al Azar - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "no expira"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "expira con el proximo update de la base de datos"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "expira en %d dia"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "expira en %d dias"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira en %d hora, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira en %d hora, %d minutos"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira en %d horas, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira en %d horas, %d minutos"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira en %d minutos"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira en %d minutos"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost para %s removido."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost para %s seteado a %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost para %s seteado a %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost para el grupo %s seteado a %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost para el grupo %s seteado a %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "El vhost para el group %s ha sido removido."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Sistema de listas xOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "El sistema de listas xOP para %s esta ahora Encendido."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "El sistema de listas xOP para %s esta ahora Encendido."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "El sistema xOP no esta disponible."
 
@@ -11454,569 +11391,3 @@ msgstr "El sistema xOP no esta disponible."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canal} texto"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s añadido a la lista AOP de %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s añadido a la lista HOP de %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s añadido a la lista SOP de %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s añadido a la lista VOP de %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s borrado de la lista HOP de %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s borrado de la lista SOP de %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s borrado de la lista VOP de %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s movido a %s en la lista HOP."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s movido a %s en la lista SOP."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s movido a %s en la lista VOP."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s no encontrado en la lista HOP de %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s no encontrado en la lista SOP de %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s no encontrado en la lista VOP de %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Previene tu nickname de aparecer en un\n"
-#~ "                   /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d dias"
-
-#~ msgid "%d hours"
-#~ msgstr "%d horas"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minutos"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d segundos"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "La lista HOP de %s esta vacia."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "La lista SOP de %s esta vacia."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "La lista VOP de %s esta vacia."
-
-#~ msgid "1 day"
-#~ msgstr "1 dia"
-
-#~ msgid "1 hour"
-#~ msgstr "1 hora"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
-
-#~ msgid "1 second"
-#~ msgstr "1 segundo"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Habilitado para usar el comando CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Habilitado para usar el comando HALFOP/DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "La lista HOP de canales %s ha sido limpiada."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d instancias borradas de la lista HOP de %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d instancias borradas de la lista SOP de %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d instancias borradas de la lista VOP de %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 instancia borrada de la lista HOP de %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 instancia borrada de la lista SOP de %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 instancia borrada de la lista VOP de %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Direccion E-mail no seteada."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | lista]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Fin de la lista de usuarios."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Mensaje de entrada para %s no seteado."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "El bot no esta en el canal %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "Mensaje de entrada: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "La lista de acceso para %s esta vacia."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Lista de acceso para %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Mensage de entrada para %s cambiado."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Modo fantasia ahora Desactivado en el canal %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Modo saludo ahora Desactivado en el canal %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista HOP para %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Error Interno - Imposible procesar peticion."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Noticia de entrada #%d borrada."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Registro de Nick (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Clave para el Nickname (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "No se ha encontrado # en frente del nombre del canal."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Modo no bot ahora Desactivado en el canal %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "No existen instancias concordantes en la lista HOP de %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "No existen instancias concordantes en la lista SOP de %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "No existen instancias concordantes en la lista VOP de %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "No existe la instancia (#%d) en la lista AOP de %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "No existe la instancia (#%d) en la lista HOP de %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "No existe la instancia (#%d) en la lista SOP de %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "No existe la instancia (#%d) en la lista VOP de %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Opcion OP-notice para %s Desactivada."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Opcion de paz para %s Desactivada."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Por favor espera %d segundos antes de utilizar el comando SEND nuevamente."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Modo privado del bot %s esta ahora Desactivado."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Opcion de privacidad para %s Desactivada."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "La protection esta Activada, sin demora."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER clave [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Acceso restringido para %s Desactivado."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista SOP para %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR El canal %s no esta registrado"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND canal [razon]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Seguridad de fundador para %s Desactivada."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Seguridad de OPs para %s Desactivada."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Opcion de seguridad para %s Desactivada."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Los Servicios no han podido cambiar modos. Estan bien configurados tus "
-#~ "servidores?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Servicios arriba %d dias, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Servicios arriba %d hora, %d minuto"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Servicios arriba %d hora, %d minutos"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Servicios arriba %d horas, %d minuto"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Servicios arriba %d minuto, %d segundo"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Servicios arriba %d minuto, %d segundos"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Servicios arriba %d minutos, %d segundo"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Opcion de kick firmado para %s Desactivada."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Lo siento, la modificacion de listas HOP de canales esta\n"
-#~ "temporalmente deshabilitada."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Lo siento, la modificacion de la lista SOP de canales esta\n"
-#~ "temporalmente deshabilitada."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Lo siento, la modificacion de la lista VOP de canales esta\n"
-#~ "temporalmente deshabilitada."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Lo siento, solo puedes tener %d instancias de AOP/SOP/VOP\n"
-#~ "en un canal."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Modo Simbiosis ahora Desactivado en el canal %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Sintaxis: RANDOMNEWS ADD texto"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR canal modos-a-limpiar"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Sintaxis: OPERNEWS ADD texto"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Sintaxis: SET DEBUG {ON | OFF | numero}\n"
-#~ "\n"
-#~ "Setea el modo debug a encendido o apagado. En modo debug,\n"
-#~ "toda la informacion enviada de y hacia los Servicios,\n"
-#~ "ademas de un numero de mensajes son escritos al archivo\n"
-#~ "de log.  Si numero es dado, el modo debug es\n"
-#~ "activado, con el nivel de debug setead a numero.\n"
-#~ "\n"
-#~ "Esta opcion es equivalente a la opcion -debug en\n"
-#~ "la linea de comando."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Sintaxis: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Lock de topic para %s Desactivado."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Retencion de topic para %s Desactivada."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Comando no conocido %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Opcion %s desconocida.\n"
-#~ "Tipea /msg %s HELP KICK para mayor informacion"
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "Usuario %s no encontrado en la base de datos de nickserv."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista VOP para %s:\n"
-#~ "  Num  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "El bot %s ha sido borrado."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] El memo que enviaste a %s ha sido leido."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Ultimo memo enviado a %s fue cancelado."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Tu vhost %s ha sido activado."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "El bot %s ha sido borrado."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "El sistema de listas xOP  para %s esta ahora Apagado."
diff --git a/language/anope.fr_FR.po b/language/anope.fr_FR.po
index 28216e4ec..4e58a1dc5 100644
--- a/language/anope.fr_FR.po
+++ b/language/anope.fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:27-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: French\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "Tapez /msg %s HELP %s pour plus d'informations."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s a changé le niveau de DEFCON en %d."
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s ajouté à la liste d'accès de %s au level %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s ajouté à la liste de kicks automatiques de %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s ajouté à la liste des mots interdits de %s."
+
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s ajouté à la liste d'AKILL."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s ajouté à la liste de SNLINEs."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s ajouté à la liste de SQLINEs."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s ajouté à la liste de SZLINEs."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s ajouté à votre liste d'accès."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s ajouté à votre liste d'accès."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s ajouté à votre liste d'accès."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s ajouté à votre liste d'accès."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "d'informations sur une certaine commande, tapez\n"
 "/msg %s HELP commande."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s vous permet d'avoir un bot sur votre canal.\n"
 "Il a été conçu pour les utilisateurs qui ne \n"
@@ -55,8 +113,8 @@ msgstr ""
 "/msg %s command. Pour plus d'information sur\n"
 "une commande spécifique, tapez /msg %s HELP command."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -76,125 +134,56 @@ msgstr ""
 "/msg %s HELP commande.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s est un utilitaire permettant aux utilisateurs IRC\n"
-"d'envoyer de courts messages aux autres utilisateurs IRC,\n"
-"qu'ils soient présents à ce moment là ou non, ou aux \n"
-"canaux(*). Le pseudo de l'expéditeur ET du destinataire (ou\n"
-"du canal) doivent être enregistrés pour pouvoir envoyer un\n"
-"mémo.\n"
-"\n"
-"Les commandes de %s sont:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s a changé le niveau de DEFCON en %d."
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s ajouté à la liste d'accès de %s au level %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s ajouté à la liste de kicks automatiques de %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s ajouté à la liste des mots interdits de %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s ajouté à la liste d'AKILL."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s ajouté à la liste de SNLINEs."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s ajouté à la liste de SQLINEs."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s ajouté à la liste de SZLINEs."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s ajouté à votre liste d'accès."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s ajouté à votre liste d'accès."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s existe déjà dans la liste des mots interdits de %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s existe déjà sur la liste de kicks automatiques de %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s existe déjà sur la liste d'AKILL."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s existe déjà dans la liste des exceptions."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s existe déjà sur la liste de SNLINEs."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s existe déjà sur la liste de SQLINEs."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s existe déjà sur la liste de SZLINEs."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s ne peut être pris comme nombre de fois pour un ban."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s a changé vos modes."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -208,42 +197,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s supprimé de la liste des AOPs de %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s supprimé de la liste d'accès de %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s supprimé de la liste de kicks automatiques de %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s supprimé de la liste des mots interdits de %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s supprimé de la liste des exceptions à la limitation de sessions."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s supprimé de la liste d'AKILL."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s supprimé de la liste de SNLINEs."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s supprimé de la liste de SQLINEs."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s supprimé de la liste de SZLINEs."
@@ -253,71 +242,81 @@ msgstr "%s supprimé de la liste de SZLINEs."
 msgid "%s deleted from your access list."
 msgstr "%s supprimé de votre liste d'accès."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s supprimé de votre liste d'accès."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s supprimé de votre liste d'accès."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "Le niveau %s est maintenant désactivé sur le canal %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s a trop de canaux enregistrés."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s est un utilitaire permettant aux utilisateurs IRC\n"
+"d'envoyer de courts messages aux autres utilisateurs IRC,\n"
+"qu'ils soient présents à ce moment là ou non, ou aux \n"
+"canaux(*). Le pseudo de l'expéditeur ET du destinataire (ou\n"
+"du canal) doivent être enregistrés pour pouvoir envoyer un\n"
+"mémo.\n"
+"\n"
+"Les commandes de %s sont:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s est déjà couvert par %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s ajouté à votre liste d'accès."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s n'est pas un type de ban valide."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s n'est pas un bot ou canal enregistré valide."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s n'est pas une adresse e-mail valide."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s n'est actuellement pas sur %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s n'a pas été trouvé dans la liste des ignorés."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s a trouvé une exception sur %s et ne peut le bannir tant que l'exception "
-"n'a pas été retirée."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -328,12 +327,12 @@ msgstr "%s a été déplacé dans la liste des AOPs de %s."
 msgid "%s not found on %s %s list."
 msgstr "%s introuvable sur la liste des AOPs de %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s introuvable sur la liste d'accès de %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s introuvable sur la liste de kicks automatiques de %s."
@@ -343,32 +342,32 @@ msgstr "%s introuvable sur la liste de kicks automatiques de %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s introuvable sur la liste des mots interdits de %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s introuvable sur la liste des sessions."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s non trouvé sur la liste des exceptions à la limitation de sessions."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s introuvable sur la liste d'AKILL."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s introuvable sur la liste de SNLINEs."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s introuvable sur la liste de SQLINEs."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s introuvable sur la liste de SZLINEs."
@@ -378,12 +377,17 @@ msgstr "%s introuvable sur la liste de SZLINEs."
 msgid "%s not found on your access list."
 msgstr "%s introuvable dans votre liste d'accès."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s introuvable dans votre liste d'accès."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s supprimé de votre liste d'accès."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -407,18 +411,12 @@ msgstr "%s est ignoré pour %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s est ignoré en permanence."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Remarque: Toutes les commandes envoyées à %s sont enregistrées!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Note: les Services sont en mode lecture-seule; les changements ne seront pas "
-"sauvegardés!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -426,12 +424,13 @@ msgstr ""
 "Rappel: les masques AKILL ne peuvent contenir de pseudo, assurez vous que "
 "vous n'avez pas mis de partie pseudo dans le masque."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 "Rappel: vous ne pouvez ajouter que des masques d'IP à la liste de SZLINEs."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -482,22 +481,22 @@ msgstr "[auto-memo] Le mémo que vous avez envoyé a été vu."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER motdepasse email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER motdepasse email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP cible motdepasse"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -515,7 +514,7 @@ msgstr ""
 "au minimum, la perte du(des) pseudo(s) faisant l'objet de \n"
 "l'abus."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -527,7 +526,8 @@ msgstr ""
 "avoir besoin de s'identifier avec un mot de passe, et peuvent\n"
 "voir l'access, AKICK, et level lists de tout canal."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -540,1016 +540,345 @@ msgstr ""
 "peuvent voir l'access list pour n'importe quel pseudo\n"
 "(/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "                 Options : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "              vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "              vhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "             Pseudo du bot : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "             Pseudo du bot : non attribué."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "            Options: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "    Kicker de majuscules : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 "    Kicker de majuscules : %s (%d kick(s) pour un ban; minimum %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "    Kicker de majuscules : %s (minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Propriétaire: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "         Type de ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "     Kicker de car. gras : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "     Kicker de car. gras : %s (%d kick(s) pour un ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "         Kicker de flood : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 "         Kicker de flood : %s (%d kick(s) pour un ban, %d lignes en %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "         Kicker de flood : %s (%d lignes en %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "      Masque : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kicker de couleurs : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kicker de couleurs : %s (%d kick(s) pour un ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "         Type de ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "Dernière utilisation: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "     Modes maintenus: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Kicker de répétition : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Kicker de répétition : %s (%d kick(s) pour un ban, %d fois)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Kicker de répétition : %s (%d fois)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "          Successeur: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspendu: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "    Kicker de majuscules : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "     Kicker de car. gras : %s (%d kick(s) pour un ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "          Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "          Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "       Dernier sujet: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "          Enregistré: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (désactivé)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (propriétaire uniquement)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Modifie la liste des adresses autorisées"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Modifie la liste des utilisateurs privilégiés"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr "ACT                Fait faire au bot l'équivalent de la commande /me"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Gère la liste des kicks automatiques"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Gère la liste des kicks automatiques"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Contrôle la liste des AKILLs"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      Liste tous les canaux auquels vous êtes connecté"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Modifie la liste des utilisateurs AOPs"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Attribue un bot à un canal"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr ""
-"    AUTOOP     Demande à Services de vous rendre automatiquement OP.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Gère la liste des mots interdits"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Ban un pseudo spécifié dans un canal"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr ""
-"    BANTYPE       Définit comment les services mettent les bans\n"
-"                      sur le canal"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Gère la liste des bots du réseau"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Liste les bots disponibles"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Annule le dernier mémo que vous avez envoyé"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL tout les utilisateurs d'un canal spécifique"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Liste tous les canaux"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr ""
-"    CHECK  Vérifie si le dernier mémo envoyé à un pseudo a été\n"
-"           lu"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr ""
-"    CLEAR      Ordonne à ChanServ de nettoyer certains paramètres\n"
-"               sur un canal"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirme une inscription à NickServ"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "        Créé : %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Active/Désactive DefCon"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfop le pseudo spécifié sur un canal"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Supprime le vhost d'un pseudo"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Efface un ou des mémos"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Supprime le vhost pour tous les pseudos d'un groupe"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deop le pseudo spécifié sur un canal"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Retire votre statut de propriétaire d'un canal"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Déprotège le pseudo donné sur un canal"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Définit la description du canal"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoice le pseudo spécifié sur un canal"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Affiche les pseudos du groupe du pseudo donné"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr ""
-"    DISPLAY    Change l'affichage de votre groupe\n"
-"                   dans les services"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Annule l'enregistrement d'un canal"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Annule l'enregistrement d'un pseudo"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "         Description: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associe une email au pseudo donné"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Associe une e-mail à votre pseudo"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr ""
-"    EXCEPTION   Modifie la liste d'exceptions à la limite de\n"
-"                sessions"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Empêche un canal d'être utilisé"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Empêche l'utilisation d'un pseudo"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Définit le propriétaire d'un canal"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Cherche et retourne la liste des pseudos enregistrés\n"
-"    avec un certain email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Retourne la clé du canal specifié"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Retrouve le mot de passe pour un pseudo\n"
-"               (uniquement si le cryptage est désactivé)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Deconnecte un \"ghost irc\" utilisant votre pseudo"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Liste tous les pseudos de votre groupe"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Envoie un message à tous les utilisateurs"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associe un message d'accueil au pseudo donné"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Associe un message d'accueil à votre pseudo"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Synchronise tous les vhosts d'un groupe"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Joint un groupe"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "  Message d'accueil: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Donne le statut d'HalfOP au pseudo donné sur un canal"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Cache certaines parties des informations du pseudo"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Configure la liste de HOP d'un canal (HalfOP)"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Vous identifie avec votre mot de passe"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modifier la liste d'ignore des services"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modifier la liste d'ignore des services"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Vous permet de voir des informations à propos de BotServ "
-"sur\n"
-"                   un canal ou un bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Affiche des informations sur un pseudo"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Liste les informations sur un canal enregistré"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Affiche des informations à propos de vos mémos"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Commande à ChanServ de vous inviter dans un canal"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Jupiter\" un serveur"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Maintient le topic quand le canal n'est\n"
-"                      pas utilisé"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Configure les kickers"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Expulse un utilisateur d'un canal"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kick le pseudo spécifié d'un canal"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Active ou désactive la protection"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Change la langue dans laquelle les Services\n"
-"                   vous envoient leurs messages"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Redéfinit la signification des niveaux d'accès"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Recherche un vhost"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr "    LIST       Liste tous les pseudos en rapport avec la recherche"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Liste tous les canaux enregistrés en rapport avec la recherche"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Liste vos mémos"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Définit les messages affichés aux utilisateurs\n"
-"                à la connexion"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Inverse la commande LOGIN"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Change les modes d'un canal"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Supprime tous les modes d'un canal"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Liste les informations sur un module chargé"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Liste les modules chargés"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Charge un module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Charge un module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Décharge un module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Change le mode de communication des Services"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Empêche le pseudo d'expirer"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Supprime temporairement toutes les O:lines\n"
-"                d'un serveur"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Désactive un vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Donne les flags d'un Oper à un utilisateur"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Active un vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Donne l'Op au pseudo spécifié sur un canal"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    Définit les messages affichés aux utilisateurs\n"
-"                qui deviennent IRCops"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr "    OPNOTICE      Envoie une notice quand OP/DEOP sont utilisés"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Vous donne votre accès propriétaire pour un canal"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "     Options : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Change le mot de passe du pseudo donné"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Change le mot de passe de votre pseudo"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Régule l'utilisation de commandes sensibles"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Cacher le canal de la commande LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Empêche le pseudo d'apparaître dans un\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protège le pseudo spécifié sur un canal"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Arrête les Services sans sauvegarde"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Définit les messages affichés aléatoirement\n"
-"                aux utilisateurs à la connexion"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Lit un ou des mémos"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr ""
-"    RECOVER    Change le pseudo d'un utilisateur qui a pris \n"
-"               votre pseudo"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Enregistre un pseudo"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Enregistre un pseudo"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE    Reprendre la tutelle de votre pseudo\n"
-"               après un RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Recharge le fichier de configuration des Services"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr ""
-"    RESEND     Renvoie le code de confirmation de \n"
-"               l'inscription à NickServ"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr ""
-"    RESTART     Sauvegarde les bases de données et relance les\n"
-"                Services."
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Restreindre l'accès au canal"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Envoie un memo et demande un accusé de reception"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "      Kicker de reverses : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "      Kicker de reverses : %s (%d kick(s) pour un ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Configure des options sur d'autres pseudos"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr "SAY                Fait dire au bot le texte donné sur un canal"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Active les fonctions de sécurité de %s"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Active ou désactive la sécurité du pseudo"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr ""
-"    SECUREFOUNDER Contrôle plus strict du statut de propriétaire \n"
-"                      du canal"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Contrôle plus strict du statut d'OP"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Envoie un mémo à un pseudo ou un canal"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Envoie un mémo à tous les pseudos enregistrés"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   A utiliser en cas de perte de mot de passe"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Affiche la liste des sessions par hôte"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Configure les options du bot"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Configure le vhost d'un pseudo"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Configure des options globales des Services"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr ""
-"    SET        Configure les options et informations du \n"
-"               canal"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Configure les options, protection comprise"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Définit des options relatives aux mémos"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Configure le vhost pour tous les pseudos d'un groupe"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Arrête les Services avec sauvegarde"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Signe les kicks générés par la commande KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Contrôle la liste des SNLINEs"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Modifie la liste des utilisateurs SOPs"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Contrôle la liste des SQLINEs"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Affiche le staff des services et leurs statuts "
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF  Envoie un mémo à tous les OPERs/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Affiche le statut des Services et du réseau"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Retourne le niveau d'accès courant d'un\n"
-"               utilisateur sur un canal"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Renvoie le statut de propriétaire du pseudo donné"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Définit le successeur d'un canal"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Suspend un canal pour ne pas qu'il soit utilisé\n"
-"               tout en conservant les données et configurations."
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend un pseudo"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Force le changement de pseudo d'un utilisateur"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Contrôle la liste des SZLINEs"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Change le sujet sur un canal spécifié"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr ""
-"    TOPICLOCK     Le sujet peut uniquement être changé avec\n"
-"                      TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Change un mode d'un utilisateur"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Retire le bot d'un canal"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Libère un canal suspendu"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend un pseudo"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Oblige les bases de données des Services\n"
-"                à être sauvegardées immédiatement."
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Met à jour votre statut, ex : vérification de nouveaux mémos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Liste tous les utilisateurs"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr " Utilisé sur : %d channel(s)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Donne un voice au pseudo spécifié sur un canal"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Configure la liste des VOP pour un canal (VOicePeople)"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Change le système de privilèges utilisateurs"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expire le %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "Kicker de mots interdits : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "Kicker de mots interdits : %s (%d kick(s) pour un ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "     Adresse e-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "        Connecté de: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "  Dernière connexion: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "    Sujet changé par: %s"
@@ -1559,20 +888,6 @@ msgstr "    Sujet changé par: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1583,26 +898,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1612,41 +918,46 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "    Vrai nom : %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "      Enregistré le: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kicker de car. soulignés : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kicker de car. soulignés : %s (%d kick(s) pour un ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Expéditeur        Date/Heure"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1654,58 +965,36 @@ msgstr ""
 "\"/msg %s\" n'est plus supporté.  Utilisez \"/msg %s@%s\" ou \"/%s\" à la "
 "place."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Jupiter\" un serveur"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Pseudo:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Pseudo:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d    %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (par %s le %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (par %s le %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1724,17 +1013,12 @@ msgstr ""
 "%5d (%s par %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Commandes %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s n'est pas notifié pour les nouveaux mémos."
@@ -1744,34 +1028,34 @@ msgstr "%s n'est pas notifié pour les nouveaux mémos."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (par %s le %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modules changés."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots disponibles."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d pseudos dans le groupe."
@@ -1782,14 +1066,14 @@ msgstr "%d pseudos dans le groupe."
 msgid "%s %s list is empty."
 msgstr "La liste des AOPs de %s est vide."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "La liste d'accès de %s est vide."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "la liste de kicks automatiques de %s est vide."
@@ -1799,7 +1083,7 @@ msgstr "la liste de kicks automatiques de %s est vide."
 msgid "%s bad words list is empty."
 msgstr "La liste des mots interdits de %s est vide."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s ne peut être successeur et propriétaire du canal %s."
@@ -1809,47 +1093,47 @@ msgstr "%s ne peut être successeur et propriétaire du canal %s."
 msgid "%s cannot receive memos."
 msgstr "%s ne peut recevoir de mémos."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Commandes %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "La couverture de %s est trop grande, utilisez un masque plus précis."
+msgid "%s commands:"
+msgstr "Commandes %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s a actuellement %d mémos, desquels %d n'ont pas été lus."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s a actuellement %d mémos, desquels 1 n'a pas été lu."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s a actuellement %d mémos."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s a actuellement %d mémos; aucun n'a été lu."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s a actuellement 1 mémo, qui n'a pas encore été lu."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s a actuellement 1 mémo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s n'a actuellement aucun mémo."
@@ -1859,47 +1143,27 @@ msgstr "%s n'a actuellement aucun mémo."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s a trop de mémos et ne peut en recevoir plus."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s n'a aucune limitation de mémos."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s n'a pas de mémos."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s n'a pas de nouveaux mémos."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s est %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s est un opérateur services du type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s n'est pas connecté(e) actuellement."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s est actuellement connecté."
@@ -1921,23 +1185,23 @@ msgstr "%s est activé"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s n'est plus SuperAdmin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s n'est pas notifié pour les nouveaux mémos."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s est notifié pour les nouveaux mémos quand ils arrivent et à la connexion."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s est notifié pour les nouveaux mémos à la connexion."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s est notifié quand de nouveaux mémos arrivent."
@@ -1956,6 +1220,11 @@ msgstr ""
 "Liste des AOPs de %s:\n"
 "  Num  Pseudo"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1997,63 +1266,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) ajouté à la liste des bots."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "La limite de mémos de %s est de %d, elle ne peut pas être changée."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "La limite de mémos de %s est de %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL toutes les nouvelles connexions"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Application des modes %s sur tous les canaux."
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore tous les non OPERs pour les messages"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Refuse toute nouvelle connexion client"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Changement des MLOCK bloqué"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Enregistrement de nouveaux canaux bloqué"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Aucun(s) nouveau(x) mémo(s) envoyé(s)"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Enregistrement de nouveaux pseudos bloqué"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Ignore silencieusement les non-OPERs"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Réduction du nombre maxi de sessions à %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<inconnu>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un mémo de masse a été envoyé à tous les pseudos enregistrés."
 
@@ -2067,40 +1339,29 @@ msgstr ""
 "son\n"
 "mémo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Un passcode a été envoyé à %s, merci de taper /msg %s confirm <passcode> une "
 "fois que vous l'aurez reçu pour compléter l'enregistrement."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "L'identd du vhost dois être dans un format d'identd valide"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr ""
-"Erreur! Un vhost peut seulement contenir les caratères A-Z, a-z, 0-9, '.' et "
-"'-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT canal texte"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
@@ -2114,19 +1375,24 @@ msgstr ""
 "AKICK canal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[pseudo-ou-usermask]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "L'application des entrées de la liste de kicks automatiques \n"
 "pour %s est terminée, %d utilisateurs étaient concernés."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL tout les utilisateurs d'un canal spécifique"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "La liste d'AKILL est vide."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2135,43 +1401,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal pseudo"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Accès refusé."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Le niveau d'accès de %s sur %s est maintenant de %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Le niveau d'accès de %s sur %s est inchangé de %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Le niveau d'accès doit être compris entre %d et %d inclus."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Le niveau d'accès doit être différent de zéro."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Options de niveaux d'accès du canal %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
@@ -2187,20 +1444,11 @@ msgstr "La liste d'accès de %s est vide."
 msgid "Access list for %s:"
 msgstr "Liste d'accès de %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Liste d'accès de %s:\n"
-"  Num   Lev  Pseudo"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Liste d'accès:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2209,6 +1457,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Active les fonctions de sécurité de %s"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Active un vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2229,7 +1487,7 @@ msgstr "Ajouter un nouvel article d'OPER news (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Nouvelle aléatoire ajoutée (n°%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2242,22 +1500,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Toutes les O:lines de %s ont été supprimées."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Toutes les O:lines de %s ont été réinitialisées."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
@@ -2266,12 +1524,12 @@ msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 msgid "All logon news items deleted."
 msgstr "Tous les articles de logon news supprimés."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Tous les mémos du canal %s ont été supprimés."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Tous vos mémos ont été supprimés."
 
@@ -2283,22 +1541,22 @@ msgstr "Tous les articles OPER news supprimés."
 msgid "All random news items deleted."
 msgstr "Toutes les nouvelles aléatoires ont été supprimées."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Tous les utilisateurs du canal %s ont été kickés."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Tous les vhosts du groupe %s ont été enregistrés en %s@%s"
@@ -2420,12 +1678,35 @@ msgstr "Autorisé à utiliser les commandes fantaisistes"
 msgid "Allowed to view the access list"
 msgstr "Autorisé à voir la liste d'accès"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Vous permet de voir des informations à propos de BotServ "
+"sur\n"
+"                   un canal ou un bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Attribue un bot à un canal"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Associe un message d'accueil à votre pseudo"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Associe une e-mail à votre pseudo"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Liste de kicks automatiques de %s:"
@@ -2450,18 +1731,18 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Mode +v automatique"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [mot | liste-d'entrées] [SINGLE|START|"
 "END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2480,26 +1761,26 @@ msgstr ""
 "Liste des mots interdits de %s:\n"
 "  Num   Mot                            Type"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "La liste des mots interdits est maintenant vide."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Le type de ban du canal %s est maintenant le numéro %d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Ban un pseudo spécifié dans un canal"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Le bot %s existe déjà."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Le bot %s n'existe pas."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Le bot %s a été attribué à %s."
@@ -2514,27 +1795,27 @@ msgstr "Le bot %s a été changé en %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Le bot %s a été supprimé."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Le bot %s est déja assigné au canal %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Le bot kickera les OPs du canal %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Le bot kickera les voices du canal %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Le bot ne kickera pas les OPs du canal %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Le bot ne kickera pas les voices du canal %s."
@@ -2564,16 +1845,11 @@ msgstr "Les identités des bots ne doivent contenir que des caractères valides."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Les pseudos des bots ne peuvent contenir que des caractères valides."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Le bot n'est pas sur le canal %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Liste des bots:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2582,7 +1858,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2593,7 +1869,7 @@ msgstr ""
 "un ban après %d kicks pour le même utilisateur. Utilisez\n"
 "la commande BADWORDS pour ajouter ou supprimer un mot."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2601,7 +1877,7 @@ msgstr ""
 "Le bot kickera maintenant les mots interdits. Utilisez\n"
 "la commande BADWORDS pour ajouter ou supprimer un mot."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2610,11 +1886,11 @@ msgstr ""
 "Le bot kickera maintenant les caractères gras, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Le bot kickera maintenant les caractères gras."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2626,7 +1902,7 @@ msgstr ""
 "entier), et mettra un ban après %d kicks pour le même \n"
 "utilisateur."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2636,7 +1912,7 @@ msgstr ""
 "constituer au moins %d caractères et %d%% du message \n"
 "entier)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2645,11 +1921,11 @@ msgstr ""
 "Le bot kickera maintenant les couleurs, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Le bot kickera maintenant les couleurs."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2659,14 +1935,14 @@ msgstr ""
 "secondes), et mettra un ban après %d kicks pour le \n"
 "même utilisateur."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 "Le bot kickera maintenant le flood (%d lignes en %d \n"
 "secondes)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2675,11 +1951,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2690,7 +1966,7 @@ msgstr ""
 "utilisateurs qui disent %d fois la même chose), et \n"
 "mettra un ban après %d kicks pour le  même utilisateur."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2699,7 +1975,7 @@ msgstr ""
 "Le bot kickera maintenant les répétitions (les \n"
 "utilisateurs qui disent %d fois la même chose)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2708,11 +1984,11 @@ msgstr ""
 "Le bot kickera maintenant les reverses, et mettra\n"
 "un ban après %d kicks pour le même utilisateur."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Le bot kickera maintenant les reverses."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2722,16 +1998,16 @@ msgstr ""
 "et mettra un ban après %d kicks pour le même \n"
 "utilisateur."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Le bot kickera maintenant les caractères soulignés."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Le bot kickera maintenant les couleurs."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2740,184 +2016,209 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Le bot ne kickera plus les mots interdits."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Le bot ne kickera plus les caractères gras."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Le bot ne kickera plus les majuscules."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Le bot ne kickera plus les couleurs."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Le bot ne kickera plus le flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Le bot ne kickera plus les répétitions."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Le bot ne kickera plus les reverses."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Le bot ne kickera plus les caractères soulignés."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Le bot ne kickera plus les majuscules."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d enregistrements, %5d ko"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots réservés aux opérateurs IRC:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Octets lus    : %5d ko"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Octets écrits : %5d ko"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {pseudo | canal}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [texte|nombre]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#canal} [raison]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK pseudo"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR canal raison"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Annule le dernier mémo que vous avez envoyé"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Annule l'enregistrement d'un canal"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Annule l'enregistrement d'un pseudo"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Impossible d'envoyer un e-mail maintenant, veuillez réessayez un peu\n"
 "plus tard."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Liste des bots:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "La liste d'accès de %s est vide."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Liste d'accès de %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d enregistrements, %5d ko"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Mode de %s changés."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s a changé vos modes."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Le canal %s n'existe pas."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Change le mode de communication des Services"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Mode de %s changés."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Le canal %s a été effacé."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Le canal %s a été interdit par %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Le canal %s est déjà enregistré!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Le canal %s est maintenant interdit."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Le canal %s est maintenant liberé."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Le canal %s est maintenant suspendu."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Le canal %s n'est pas enregistré."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Le canal %s ne peut être ni enregistré ni utilisé."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Le canal %s ne peut pas être enregistré."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Le canal %s a été enregistré sous votre pseudo: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Channel       : %6d enregistrements, %5d ko"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Le canal %s expirera."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Le canal %s n'expirera pas."
@@ -2927,33 +2228,28 @@ msgstr "Le canal %s n'expirera pas."
 msgid "Channel %s %s list has been cleared."
 msgstr "La liste des AOPs de %s est maintenant vide."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La liste d'accès de %s est maintenant vide."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La liste de kicks automatiques de %s est maintenant vide."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Le canal %s est maintenant liberé."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Le canal %s n'est pas un canal valide."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Les SQLINEs de canaux ne sont pas supportées par votre serveur, vous ne "
 "pouvez donc pas les utiliser."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2961,7 +2257,7 @@ msgstr ""
 "Liste des channels:\n"
 "Nom                  Users Modes   Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2970,7 +2266,7 @@ msgstr ""
 "Liste des canaux auquels %s a accès:\n"
 "  Num  Canal                Level    Description "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2978,16 +2274,49 @@ msgstr ""
 "Liste des canaux auquels vous avez accès:\n"
 "  Num  Canal                Level    Description "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr ""
+"    CHECK  Vérifie si le dernier mémo envoyé à un pseudo a été\n"
+"           lu"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Configure les options du bot"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Configure les kickers"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirme une inscription à NickServ"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Supprime tous les modes d'un canal"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossible de libérer le canal %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Liste d'AKILL actuelle:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2995,15 +2324,15 @@ msgstr ""
 "Liste d'AKILL actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Liste des modules courant:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Liste de SNLINEs actuelle:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3011,11 +2340,11 @@ msgstr ""
 "Liste de SNLINEs actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Liste de SQLINEs actuelle:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3023,11 +2352,11 @@ msgstr ""
 "Liste de SQLINEs actuelle:\n"
 "  Num   Masque                            Raison"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Liste de SZLINEs actuelle:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3036,7 +2365,7 @@ msgstr ""
 "  Num   Masque                            Raison"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Liste actuelle des exceptions à la limitation de sessions:"
 
@@ -3060,56 +2389,61 @@ msgstr "Nombre de SQLINEs actuel: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Nombre de SZLINEs actuel: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Utilisateurs actuels: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <pseudo>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {num | liste | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <pseudo>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP canal"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Désactive un vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3234,6 +2568,47 @@ msgstr "Temps d'échéance des SZLINEs par défaut: 1 minute"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Temps d'échéance des SZLINEs par défaut: Pas d'échéance"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Définit les messages affichés aux utilisateurs\n"
+"                à la connexion"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Définit les messages affichés aux utilisateurs\n"
+"                à la connexion"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    Définit les messages affichés aux utilisateurs\n"
+"                qui deviennent IRCops"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfop le pseudo spécifié sur un canal"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Efface un ou des mémos"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Supprime le vhost pour tous les pseudos d'un groupe"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Supprime le vhost d'un pseudo"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3244,7 +2619,7 @@ msgstr "%d entrées supprimées de la liste des AOPs de %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d entrées supprimées de la liste d'accès de %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d entrées supprimées de la liste de kicks automatiques de %s."
@@ -3285,7 +2660,7 @@ msgstr "%d entrées supprimées de la liste de SZLINEs."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 entrée supprimée de la liste d'accès de %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 entrée supprimée de la liste de kicks automatiques de %s."
@@ -3321,32 +2696,74 @@ msgstr "1 entrée supprimée de la liste de SZLINEs."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 entrée supprimée de la liste des AOPs de %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deop le pseudo spécifié sur un canal"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Déprotège le pseudo donné sur un canal"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La description de %s est maintenant %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoice le pseudo spécifié sur un canal"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Deconnecte un \"ghost irc\" utilisant votre pseudo"
+
+#: modules/core/os_staff.cpp:21
 #, fuzzy
-msgid "Disabled"
-msgstr "inactif"
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Affiche le staff des services et leurs statuts "
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Affiche tous les enregistrements (Nb: %d) "
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Affiche les enregistrements de %d à %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Affiche les enregistrements contenant %s (Nb: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Affiche des informations sur un pseudo"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Affiche des informations à propos de vos mémos"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Recherche un vhost"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Affiche des informations à propos de vos mémos"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3375,167 +2792,210 @@ msgstr "Ne dites pas %s sur ce canal!"
 msgid "Don't use underlines on this channel!"
 msgstr "N'utilisez pas de caractères soulignés sur ce canal!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "L'adresse E-mail pour %s a été changée en %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "L'adresse E-mail pour %s a été effacée."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "L'adresse e-mail de %s est invalide."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paramètres]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "E-mails trouvés %s pour %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "actif"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Fin du %s list."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Fin de liste d'accès."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Fin de la liste des channels."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fin de la liste - %d/%d correspondances affichées."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la liste - %d/%d correspondances affichées."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Fin de la liste des utilisateurs."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Français"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
-msgstr "Erreur! l'Ident est trop long, veuillez entrer moins de %d caratères."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
+msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Recharge le fichier de configuration des Services"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
-msgstr "Erreur! Le vhost est trop long, veuillez entrer moins de %d caratères."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
+msgstr ""
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "L'exception pour %s (#%d) a été déplacée à la position %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "L'exception pour %s a été changée en %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expire le: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "L'échéance de %s a été changée."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID canal raison"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [raison]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID pseudo raison"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID pseudo [raison]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantaisie"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "La fantaisie est maintenant activée sur le canal %s."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "La fantaisie est maintenant activée sur le canal %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s n'est plus ignoré"
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Le masque %s existe déjà dans votre liste d'accès."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Oblige les bases de données des Services\n"
+"                à être sauvegardées immédiatement."
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Force le changement de pseudo d'un utilisateur"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   A utiliser en cas de perte de mot de passe"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Le propriétaire de %s est maintenant %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Pas de jokers !!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS pseudo"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "La commande GETPASS est indisponible car le cryptage est utilisé."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST pseudo [motdepasse]"
 
@@ -3543,11 +3003,26 @@ msgstr "GHOST pseudo [motdepasse]"
 msgid "GLOBAL message"
 msgstr "GLOBAL message"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "L'utilisateur fantôme utilisant votre pseudo a été déconnecté."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Donne les flags d'un Oper à un utilisateur"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Donne l'Op au pseudo spécifié sur un canal"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Vous donne votre accès propriétaire pour un canal"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Message d'accueil"
 
@@ -3555,78 +3030,156 @@ msgstr "Message d'accueil"
 msgid "Greet message displayed"
 msgstr "Message d'accueil affiché"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Le message d'accueil pour %s a été changé en %s"
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Le message d'accueil de %s a été effacé."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Le message d'accueil est maintenant activé sur le canal %s."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Le message d'accueil est maintenant activé sur le canal %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Donne le statut d'HalfOP au pseudo donné sur un canal"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Cache certaines parties des informations du pseudo"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Cacher le canal de la commande LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d enregistrements, %5d ko"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hôtes ayant au moins %d sessions:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY motdepasse"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [durée] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO pseudo"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | pseudo}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Vous identifie avec votre mot de passe"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Si vous ne changez pas d'ici 20 secondes, je changerai votre pseudo."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Si vous ne changez pas d'ici 1 minute, je changerai votre pseudo."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La liste des ignorés a été purgée."
@@ -3635,12 +3188,13 @@ msgstr "La liste des ignorés a été purgée."
 msgid "Ignore list is empty."
 msgstr "La liste des ignorés est vide."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Liste des bots:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3656,25 +3210,17 @@ msgstr ""
 "Tapez /msg %s HELP SET option pour plus d'informations\n"
 "sur une option spécifique."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Portée incorrecte spécifiée. La syntaxe correcte est #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Liste les informations sur un module chargé"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Information pour le bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informations pour le canal %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Echéance invalide."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3682,12 +3228,11 @@ msgstr ""
 "Masque d'hôte invalide. Seuls les masques d'hôtes réels sont valides puisque "
 "les exceptions ne sont pas comparées aux pseudos et utilisateurs."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
-msgstr "Passcode invalide, merci de le vérifier."
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
+msgstr ""
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3696,7 +3241,7 @@ msgstr ""
 "Limite de session invalide. Elle doit être un entier valide supérieur ou "
 "égal à zero et plus petit que %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Valeur minimale invalide. Elle doit être un entier valide supérieur à 1."
@@ -3705,12 +3250,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE nom-du-serveur [raison]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Joint un groupe"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal option {ON|OFF} [paramètres]"
@@ -3719,262 +3269,446 @@ msgstr "KICK canal option {ON|OFF} [paramètres]"
 msgid "KICK channel user reason"
 msgstr "KICK canal utilisateur raison"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "La clé du canal %s est %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Expulse un utilisateur d'un canal"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kick le pseudo spécifié d'un canal"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr ""
+"    RECOVER    Change le pseudo d'un utilisateur qui a pris \n"
+"               votre pseudo"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [option [level]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST modèle"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST modèle [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [liste | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP cible motdepasse"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Votre langue est maintenant le Français."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Le dernier mémo envoyé à %s a été supprimé."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "       Dernier déconnexion: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "            Adresse: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Le niveau pour %s du channel %s est maintenant de %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Le niveau doit être compris entre %d et %d inclus."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Cette commande est inutile dans ce mode."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Liste des entrées correspondantes à %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr "    LIST       Liste tous les pseudos en rapport avec la recherche"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      Liste tous les canaux auquels vous êtes connecté"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Liste les modules chargés"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste des pseudos dans le groupe de %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Liste des pseudos dans votre groupe:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Liste vos mémos"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Liste tous les canaux"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Liste des pseudos dans votre groupe:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Liste tous les canaux enregistrés en rapport avec la recherche"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Liste tous les utilisateurs"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Liste les bots disponibles"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Liste les informations sur un canal enregistré"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Charge un module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Les canaux locaux ne peuvent être enregistrés."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
+msgstr "Article de logon news #%d supprimé."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Article de logon news #%d non trouvé!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Articles des logon news:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE canal modes"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO Fichier"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Fichier"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Fichier"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Fichier"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Gère la liste des kicks automatiques"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Gère la liste des mots interdits"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Gère la liste des bots du réseau"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Configure la liste de HOP d'un canal (HalfOP)"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Configure la liste des VOP pour un canal (VOicePeople)"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr "ACT                Fait faire au bot l'équivalent de la commande /me"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr "SAY                Fait dire au bot le texte donné sur un canal"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Gère la liste des kicks automatiques"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modifier la liste d'ignore des services"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Contrôle la liste des AKILLs"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Active/Désactive DefCon"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Contrôle la liste des SNLINEs"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Contrôle la liste des SQLINEs"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Contrôle la liste des SZLINEs"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Change le sujet sur un canal spécifié"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Le masque %s existe déjà dans votre liste d'accès."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Le masque doit avoir le format user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Cherche et retourne la liste des pseudos enregistrés\n"
+"    avec un certain email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Record d'utilisateurs: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Mémo %d de %s (%s).  Pour supprimer, tapez: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Mémo %d de %s (%s).  Pour supprimer, tapez: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Le mémo %d a été supprimé."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de mémos de %s désactivée."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de mémos de %s définie à %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de mémos de %s définie à 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Limite de mémos trop grande, limitation à %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Mémo envoyé à %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ num"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ num"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Mode message"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "     Modes maintenus: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modifier la liste d'ignore des services"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Modifie la liste des utilisateurs AOPs"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Modifie la liste des utilisateurs SOPs"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Modifie la liste des adresses autorisées"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Modifie la liste des utilisateurs privilégiés"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr ""
+"    EXCEPTION   Modifie la liste d'exceptions à la limite de\n"
+"                sessions"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Le module %s a été chargé."
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Le module %s a été chargé."
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Le module %s a été déchargé."
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Auteur: %s chargé: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} serveur"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliases NS    : %6d enregistrements, %5d ko"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Groupes NS    : %6d enregistrements, %5d ko"
@@ -3987,11 +3721,13 @@ msgstr "Jamais kické par les kickers du bot"
 msgid "New memo"
 msgstr "Nouveau mémo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Nouveaux mémos pour %s.  Pour lire, tapez: /msg %s READ num"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Nouveaux mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 
@@ -3999,141 +3735,107 @@ msgstr "Nouveaux mémos pour %s.  Pour lire, tapez: /msg %s READ %s num"
 msgid "News list is full!"
 msgstr "La liste des News est pleine!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Le pseudo %s a été interdit par %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Le pseudo %s a été effacé."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Le pseudo %s est déjà enregistré!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Le pseudo %s est un pseudo illégal et ne peut pas etre utilisé."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Le pseudo %s est déja utilisé."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Le pseudo %s est désormais interdit."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Le pseudo %s fait partie des services du réseau."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Le pseudo %s n'est pas en tutelle."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Le pseudo %s n'est actuellement pas utilisé."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Le nick %s n'est pas enregistré."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Le pseudo %s ne peut être ni enregistré ni utilisé."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s n'a pas été trouvé dans la liste des ignorés."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Le pseudo %s a été tronqué de %d caractères."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Le pseudo %s expirera."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Le pseudo %s n'expirera pas."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Le pseudo %s n'a aucun mémo de votre part."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Le pseudo %s n'est plus identifié."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Le pseudo %s est actuellement suspendu."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Le pseudo %s est liberé."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Le pseudo %s est suspendu."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Pseudo non enregistré... Réessayez plus tard."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Pseudo %s confirmé"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Le pseudo %s a été effacé."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Le pseudo %s est déjà enregistré!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Le pseudo %s ne peut être enregistré."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Le pseudo %s est maintenant enregistré sous votre masque: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Le pseudo %s est enregistré."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Enregistrement d'un pseudo (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4144,26 +3846,36 @@ msgstr ""
 "l'expiration automatique, c'est-à-dire qu'ils seront effacés\n"
 "après %d jours de non utilisation."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Le mode sans bot est maintenant activé sur le canal %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Le mode sans bot est maintenant activé sur le canal %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Aucun E-mail listé pour %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Pas de bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "n'expire pas"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Aucune aide disponible sur %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Aucune information sur le module %s n'est accessible."
@@ -4178,13 +3890,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Aucune entrée correspondante sur la liste des AOPs de %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Aucune entrée correspondante sur la liste d'accès de %s."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Aucune entrée correspondante sur la liste de kicks automatiques de %s."
@@ -4197,41 +3909,45 @@ msgstr ""
 "Aucune entrée correspondante sur la liste des mots interdits \n"
 "de %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Aucune entrée correspondante sur la liste des exceptions à la limitation de "
 "sessions."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Aucune entrée correspondante sur la liste d'AKILL."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SNLINEs."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SQLINEs."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Aucune entrée correspondante sur la liste de SZLINEs."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Aucun mémo n'était annulable."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Aucun module n'est chargé"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Pas d'article OPER news à supprimer!"
@@ -4240,16 +3956,12 @@ msgstr "Pas d'article OPER news à supprimer!"
 msgid "No random news items to delete!"
 msgstr "Aucune nouvelle aléatoire à supprimer!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Aucune raison"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Pas de kick signé quand SIGNKICK LEVEL est utilisé"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Aucune"
 
@@ -4257,7 +3969,7 @@ msgstr "Aucune"
 msgid "Not allowed to join channel"
 msgstr "Non autorisé à rejoindre le canal s'il est restreint"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4269,28 +3981,28 @@ msgstr ""
 "utilisateur figurant sur la liste d'accès du canal\n"
 "ne vient sur le canal) il sera automatiquement effacé."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Num  Limite  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE pseudo flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Notice sur OP"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4299,13 +4011,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "L'ancienne information est égale à la nouvelle."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Pseudo"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "L'option 'op-notice' est maintenant ACTIVE sur %s."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "L'option 'op-notice' est maintenant ACTIVE sur %s."
 
 #: modules/core/os_news.cpp:55
@@ -4314,134 +4031,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Article OPER news #%d supprimé."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Article OPER news #%d non trouvé!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Articles oper news:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d enregistrements, %5d ko"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Une O:LINE avec les flags %s a été ajoutée pour %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Protection des OPs"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "L'option %s ne peut être changée sur ce réseau."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Le passcode pour %s est %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Mot de passe accepté - vous êtes maintenant identifié."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"L'authentification par mot de passe est requise pour cette commande.\n"
-"Réessayez après avoir tapé /msg %s IDENTIFY motdepasse."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Le mot de passe pour %s a été changé en %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Mot de passe changé pour %s."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Mot de passe incorrect."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Le mot de passe de %s est %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Mot de passe incorrect."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Le mot de passe de %s a été envoyé."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Paix"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Le mode 'paix' est ACTIF pour %s."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Le mode 'paix' est ACTIF pour %s."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Contactez un opérateur afin d'avoir un vhost sous ce pseudo."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Veuillez réessayer avec un mot de passe plus difficile à trouver.  Les mots "
-"de passe doivent contenir au moins cinq caractères, ne doivent pas être trop "
-"facilement devinables (par exemple votre vrai nom ou votre pseudo), et ne "
-"doivent pas contenir d'espaces ou de tabulations."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Veuillez indiquer un nom de serveur valide pour JUPE."
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr ""
-"Veuillez utiliser les symbole # quand vous voulez enregistrer\n"
-"un canal."
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Attendez %d secondes et réessayez."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Attendez %d secondes avant d'utiliser la commande GROUP à nouveau."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4459,63 +4137,122 @@ msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Veuillez patienter %d secondes avant d'utiliser la commande SEND à nouveau."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Empêche un canal d'être utilisé"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Suspend un canal pour ne pas qu'il soit utilisé\n"
+"               tout en conservant les données et configurations."
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Empêche le pseudo d'apparaître dans un\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Empêche le pseudo d'expirer"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Empêche l'utilisation d'un pseudo"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Confidentialité"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "Le mode privé du bot %s est maintenant activé."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "Le mode privé du bot %s est maintenant activé."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "L'option 'privé' pour %s est maintenant ACTIVE."
+
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now on."
 msgstr "L'option 'privé' pour %s est maintenant ACTIVE."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now off for %s."
 msgstr "L'option 'privé' est maintenant ACTIVE pour %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
+msgstr "L'option 'privé' est maintenant ACTIVE pour %s."
+
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Protection"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "La protection est maintenant ACTIVE pour %s."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "La protection est maintenant ACTIVE pour %s, avec un délai réduit."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "La protection est maintenant ACTIVE pour %s, sans aucun délai."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "La protection est maintenant ACTIVE pour %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protège le pseudo spécifié sur un canal"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Fournir la commande: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {liste | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER pseudo [motdepasse]"
 
@@ -4523,15 +4260,15 @@ msgstr "RECOVER pseudo [motdepasse]"
 msgid "REGISTER channel description"
 msgstr "REGISTER canal motdepasse description"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE pseudo [motdepasse]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {pseudo | canal} memo-text"
 
@@ -4541,290 +4278,370 @@ msgid "Random news item #%d deleted."
 msgstr "Nouvelle aléatoire n°%d supprimée."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Nouvelle aléatoire n°%d non trouvée!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Nouvelles aléatoires:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Lit un ou des mémos"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Redéfinit la signification des niveaux d'accès"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
 msgstr ""
-"Aucune validation en attente... Tapez: \"/msg %s register <password> <email>"
-"\" pour l'enregistrer."
+"    RELEASE    Reprendre la tutelle de votre pseudo\n"
+"               après un RECOVER"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Enregistre un pseudo"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Enregistre un pseudo"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Régule l'utilisation de commandes sensibles"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Libère un canal suspendu"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Charge un module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Recharge le fichier de configuration des Services"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Retire votre statut de propriétaire d'un canal"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Restreindre l'accès au canal"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Accès restreint"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr "Les restrictions d'accès pour %s sont maintenant ACTIVES."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_restricted.cpp:34
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now on."
+msgstr "Les restrictions d'accès pour %s sont maintenant ACTIVES."
+
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Maintient le topic quand le canal n'est\n"
+"                      pas utilisé"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Retrouve le mot de passe pour un pseudo\n"
+"               (uniquement si le cryptage est désactivé)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Retourne le niveau d'accès courant d'un\n"
+"               utilisateur sur un canal"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Retourne la clé du canal specifié"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Renvoie le statut de propriétaire du pseudo donné"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Inverse la commande LOGIN"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET pseudo PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET pseudo option paramètres"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET pseudo KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET pseudo KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET pseudo NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET pseudo PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET pseudo SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET pseudo HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY canal texte"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {pseudo | canal} texte-du-memo"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS pseudo"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "La commande SENDPASS est indisponible car le cryptage est utilisé."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <pseudo> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal option paramètres"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET canal option paramètres"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET option paramètres"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET option valeur"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE nombre"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
@@ -4832,7 +4649,7 @@ msgstr "SET LIMIT [canal] limite"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [utilisateur | canal] {limite | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4840,24 +4657,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <pseudo> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "La liste de SNLINEs est vide."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4865,16 +4682,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "La liste de SQLINEs est vide."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4883,54 +4700,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées}[:raison]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Mot de passe accepté - vous êtes maintenant identifié."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Mot de passe accepté - vous êtes maintenant identifié."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUT %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "ERREUR : Le pseudo %s n'est pas connecté."
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal raison"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND canal raison"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND pseudo raison"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK pseudo nouveau-pseudo "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "La liste de SZLINEs est vide."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4939,65 +4766,121 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+échéance] {masque | liste "
 "d'entrées} [raison]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr ""
+"    RESTART     Sauvegarde les bases de données et relance les\n"
+"                Services."
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Sécurité"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Contrôle du propriétaire"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Contrôle des OPs"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "L'option de sécurité du propriétaire pour %s est ACTIVE."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "L'option de sécurité du propriétaire pour %s est ACTIVE."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
+msgstr "La sécurité des OPs pour %s est maintenant ACTIVE."
+
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now on."
 msgstr "La sécurité des OPs pour %s est maintenant ACTIVE."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secure.cpp:38
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now off."
 msgstr "L'option de sécurité pour %s est ACTIVE."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option for %s is now on."
+msgstr "L'option de sécurité pour %s est ACTIVE."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "L'option de sécurité est maintenant ACTIVE pour %s."
+
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
 msgstr "L'option de sécurité est maintenant ACTIVE pour %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Sécurité"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Envoie un mémo à un pseudo ou un canal"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF  Envoie un mémo à tous les OPERs/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Envoie un mémo à tous les pseudos enregistrés"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Envoie un message à tous les utilisateurs"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr "    OPNOTICE      Envoie une notice quand OP/DEOP sont utilisés"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Envoie un memo et demande un accusé de reception"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Serveurs trouvés: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Ce service est temporairement désactivé, veuillez réessayer ultérieurement."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Les services sont maintenant sur DEFCON %d."
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Les Services sont maintenant en mode expiration."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Les Services sont maintenant en mode sans expiration."
 
@@ -5009,7 +4892,7 @@ msgstr "Les Services sont maintenant en mode lecture-seule."
 msgid "Services are now in read-write mode."
 msgstr "Les Services sont maintenant en mode lecture-écriture."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Les Services sont maintenant en mode debug (niveau %d)."
@@ -5022,7 +4905,7 @@ msgstr "Les Services sont maintenant en mode debug."
 msgid "Services are now in non-debug mode."
 msgstr "Les Services sont maintenant en mode normal ( non debug)."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Les services ont été configurés pour ne pas envoyer de mail."
 
@@ -5032,7 +4915,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5041,150 +4924,196 @@ msgstr ""
 "Les Services ne peuvent changer les modes. Les U:lines de vos serveurs sont-"
 "elles configurées correctement?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Les services tournent depuis %d jours, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Les services tournent depuis %d heures, %d minutes"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Les services tournent depuis %d minutes, %d secondes"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Serveurs trouvés: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Le service ne rendra plus %s automatiquement OP dans les canaux."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Le service rendra %s automatiquement OP dans les canaux."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Les services repondront à %s par des messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Les services repondront à %s par des notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Le fichier de configuration des Services a été rechargé."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "La tutelle des Services sur votre pseudo a été enlevée."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "La limite de sessions de %s est maintenant de %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "La limitation de sessions est désactivée."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessions      : %6d enregistrements, %5d ko"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Configure des options sur d'autres pseudos"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr ""
+"    SET        Configure les options et informations du \n"
+"               canal"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr ""
+"    BANTYPE       Définit comment les services mettent les bans\n"
+"                      sur le canal"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Définit des options relatives aux mémos"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Configure les options, protection comprise"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Définit la description du canal"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Affiche les pseudos du groupe du pseudo donné"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr ""
+"    DISPLAY    Change l'affichage de votre groupe\n"
+"                   dans les services"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Définit le propriétaire d'un canal"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Change la langue dans laquelle les Services\n"
+"                   vous envoient leurs messages"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Change le mot de passe du pseudo donné"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Définit le successeur d'un canal"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Configure le vhost pour tous les pseudos d'un groupe"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Configure le vhost d'un pseudo"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Configure des options globales des Services"
+
+#: modules/core/ns_set.cpp:169
 #, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Change le mot de passe de votre pseudo"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "L'option %s est inconnue.  Tapez /msg %s HELP LEVELS DESC pour une \n"
 "liste d'options valides."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "La valeur pour DEBUG doit être ON, OFF, ou un nombre positif."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "La valeur de NOEXPIRE doit être ON ou OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "La valeur pour READONLY doit être ON ou OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Syntaxe incorrect, spécifiez ON ou OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Les kicks seront maintenant signés sur %s."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr ""
+"    AUTOOP     Demande à Services de vous rendre automatiquement OP.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Affiche le statut des Services et du réseau"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Signe les kicks générés par la commande KICK"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5193,27 +5122,33 @@ msgstr ""
 "Les kicks seront maintenant signés sur %s en fonction de \n"
 "l'accès de l'utilisateur sur le canal."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Les kicks seront maintenant signés sur %s."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Les kicks seront maintenant signés sur %s."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Kicks signés"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Désolé, RSEND est désactivé sur ce réseau."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Désolé, l'attribution des bots est temporairement désactivée."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Désolé, la création du bot a échoué."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Désolé, la modification des bots est temporairement désactivée."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des options du bot est \n"
@@ -5227,7 +5162,7 @@ msgstr ""
 "Désolé, la modification des listes des AOPs des canaux est temporairement "
 "désactivée."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification des listes d'accès des canaux est temporairement "
@@ -5239,69 +5174,46 @@ msgstr ""
 "Désolé, la modification de la liste de kicks automatiques du canal \n"
 "est temporairement désactivée."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification de la liste des mots interdits\n"
 "est temporairement désactivée."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Désolé, l'effacement de canaux est temporairement désactivé."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-"Désolé, la configuration des options du canal est temporairement désactivée."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Désolé, l'enregistrement des canaux est temporairement désactivé."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Désolé, impossible de changer le mot de passe pour %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Désolé, l'identification a échoué."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des kickers est temporairement\n"
 "désactivée."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Désolé, la configuration des options est temporairement désactivée."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Désolé, l'envoi de mémos est temporairement désactivé."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Désolé, l'effacement de pseudo est temporairement désactivé."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Désolé, le groupage de pseudos est temporairement désactivé."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-"Désolé, la configuration des options du pseudo est temporairement désactivée."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Désolé, l'enregistrement des pseudos est temporairement désactivé."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Désolé, l'enregistrement a échoué."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5313,13 +5225,13 @@ msgstr ""
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Vous ne pouvez avoir que %d entrées dans la liste d'accès d'un pseudo."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Désolé, vous ne pouvez avoir que %d entrées sur la liste d'accès d'un canal."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
@@ -5333,21 +5245,16 @@ msgstr ""
 "Désolé, vous ne pouvez avoir que %d entrées sur la\n"
 "liste des mots interdits."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Désolé, vous avez déjà dépassé votre limite de %d canaux."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Désolé, vous avez déjà atteint votre limite de %d canaux."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Vous ne pouvez avoir que %d entrées dans la liste d'accès d'un pseudo."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistiques réinitialisées."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Statut mis à jour (memos, vhost, modes, flags)."
 
@@ -5359,12 +5266,24 @@ msgstr "Arrêtez d'envoyer autant de messages!"
 msgid "Stop repeating yourself!"
 msgstr "Arrêtez de vous répéter!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr ""
+"    SECUREFOUNDER Contrôle plus strict du statut de propriétaire \n"
+"                      du canal"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Contrôle plus strict du statut d'OP"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Il n'y a plus de successeur sur %s."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Le successeur de %s est maintenant %s."
@@ -5373,21 +5292,36 @@ msgstr "Le successeur de %s est maintenant %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "L'option Super-Admin n'est pas activée dans le services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend un pseudo"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Symbiose"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now off on channel %s."
 msgstr "La symbiose est maintenant activée sur le canal %s."
 
-#: src/language.cpp:129
+#: modules/core/bs_set.cpp:151
+#, fuzzy, c-format
+msgid "Symbiosis mode is now on on channel %s."
+msgstr "La symbiose est maintenant activée sur le canal %s."
+
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Synchronise tous les vhosts d'un groupe"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Syntaxe: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5414,7 +5348,7 @@ msgstr ""
 "2: ban de style *!*@host\n"
 "3: ban de style *!*user@*.domain"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5427,7 +5361,7 @@ msgstr ""
 "Définit la description du canal, qui apparait dans les\n"
 "commandes LIST et INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5440,7 +5374,7 @@ msgstr ""
 "Change le propriétaire d'un canal. Le nouveau pseudo doit être\n"
 "enregistré."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5459,7 +5393,7 @@ msgstr ""
 "dernier utilisateur ait quitté le canal, et sera restauré\n"
 "la prochaine fois que le canal sera créé. "
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5476,7 +5410,7 @@ msgstr ""
 "canal à chaque fois que les commandes OP ou DEOP sont\n"
 "utilisées par un utilisateur sur le canal."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5494,7 +5428,7 @@ msgstr ""
 "de canal d'un user qui a un niveau supérieur ou\n"
 "égal au sien via les commandes de %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5539,7 +5473,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5553,7 +5488,7 @@ msgstr ""
 "Si private est défini, un /msg %s LIST ne comprendra\n"
 "le canal dans aucune liste."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5568,7 +5503,7 @@ msgstr ""
 "Quand l'accès restreint est activé, les utilisateurs qui ne sont\n"
 "pas inscrits à la liste d'accès seront kickés et bannis du canal."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5587,7 +5522,7 @@ msgstr ""
 "qui sont identifiés avec leur mot de passe auront accès\n"
 "au canal, sous contrôle de la liste d'accès."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5606,7 +5541,7 @@ msgstr ""
 "son propriétaire et son successeur, et non pas ceux qui sont identifiés \n"
 "avec %s."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5629,7 +5564,24 @@ msgstr ""
 "si aucun successeur n'avait été nommé. Le nouveau pseudo\n"
 "doit être enregistré."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntaxe: %s canal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Active ou désactive l'option de verrouillage du sujet pour\n"
+"un canal. Lorsque le verrouillage du sujet est actif,\n"
+"%s ne permettra pas le changement du sujet du canal sauf\n"
+"avec la commande TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5676,8 +5628,8 @@ msgstr ""
 "Passer du système de listes de xOPs au système de liste\n"
 "d'accès ne pose aucun problème par contre."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5766,7 +5718,7 @@ msgstr ""
 "La commande ACCESS CLEAR supprime toutes les entrées\n"
 "de la liste d'accès."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5814,7 +5766,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Affiche votre liste d'accès."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5826,7 +5778,7 @@ msgstr ""
 "Fait faire au bot l'équivalent d'une commande \"/me\"\n"
 "sur le canal donné avec le texte donné."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5846,7 +5798,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5870,7 +5822,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5928,7 +5880,7 @@ msgstr ""
 "La commande AKICK CLEAR supprime toutes les entrées\n"
 "de la liste de kicks automatiques."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -6021,7 +5973,7 @@ msgstr ""
 "\n"
 "Réservé aux opérateurs des Services."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6060,7 +6012,7 @@ msgstr ""
 "Les canaux ayant l'option NOEXPIRE active seront retournés avec un point \n"
 "d'exclamation devant."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6077,7 +6029,7 @@ msgstr ""
 "level liste les canaux auxquels le pseudo donné a un accès supérieur\n"
 "ou égal au niveau donné."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6107,17 +6059,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntaxe: AOP canal ADD pseudo\n"
 "         AOP canal DEL {pseudo | liste d'entrées | liste}\n"
@@ -6161,7 +6102,7 @@ msgstr ""
 "d'accès, et /msg %s HELP SET XOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6175,8 +6116,8 @@ msgstr ""
 "pouvez ensuite configurer le bot pour qu'il convienne à\n"
 "vos besoins."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6197,20 +6138,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Syntaxe: BADWORDS canal ADD mot [SINGLE | START | END]\n"
 "         BADWORDS canal DEL {mot | entry-num | liste}\n"
@@ -6248,7 +6175,7 @@ msgstr ""
 "La commande BADWORDS CLEAR supprime toutes les entrées\n"
 "de la liste des mots interdits."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6263,7 +6190,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6306,7 +6233,7 @@ msgstr ""
 "utilise le pseudo du bot lors de sa création ou modification,\n"
 "il sera déconnecté."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6316,7 +6243,7 @@ msgstr ""
 "\n"
 "Liste tous les bots disponibles sur ce réseau."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6329,7 +6256,21 @@ msgstr ""
 "canal donné, à condition qu'il n'ait pas été lu lorsque vous\n"
 "utilisez la commande."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6340,7 +6281,7 @@ msgstr ""
 "Inflige un AKILL à toutes les personnes qui sont sur le canal\n"
 "spécifié. Ceci utilise le réel identd@host de tous les pseudos. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6362,7 +6303,7 @@ msgstr ""
 "canaux \n"
 "correspondants à modèle qui ont le mode +s ou +p."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6376,7 +6317,7 @@ msgstr ""
 "Note: Cela fonctionne uniquement avec un pseudo et non pas avec un\n"
 "canal."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6392,7 +6333,7 @@ msgstr ""
 "\n"
 "Limité à ceux ayant un accès de propriétaire sur le canal."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6402,16 +6343,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6429,7 +6383,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6440,7 +6394,7 @@ msgstr ""
 "Le système defcon utilise et applique des configurations\n"
 "pré-definies pour protéger durant une attaque sur le réseau."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6461,7 +6415,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux HOPs ou à ceux ayant un \n"
 "niveau d'accès de 4 ou plus en cas de DeHalfOP sur soi-même."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6471,7 +6425,7 @@ msgstr ""
 "Supprime le vhost pour le pseudo indiqué.\n"
 "Limité aux Services Opérateurs."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6509,7 +6463,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Supprime les mémos compris entre 2 et 5 et entre 7 et 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6521,7 +6475,7 @@ msgstr ""
 "groupe que le pseudo donné.\n"
 "Limité aux Services Opérateurs."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6540,7 +6494,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6558,7 +6512,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6578,7 +6532,7 @@ msgstr ""
 "ou à ceux ayant un niveau d'accès de 10 ou plus en cas de \n"
 "suppression de protection pour soi-même."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6599,7 +6553,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux VOPs ou à ceux ayant un \n"
 "niveau d'accès de 3 ou plus en cas de devoice sur soi-même."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6611,7 +6565,7 @@ msgstr ""
 "Efface le canal donné. Peut uniquement être utilisé par\n"
 "le propriétaire du canal."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6624,8 +6578,8 @@ msgstr ""
 "peuvent effacer un canal pour lequel ils n'ont\n"
 "pas été identifiés."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6656,7 +6610,7 @@ msgstr ""
 "identifier avec votre mot de passe (/msg %s HELP \n"
 "IDENTIFY pour plus d'informations)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6680,7 +6634,7 @@ msgstr ""
 "d'effacer n'importe quel pseudo est cependant réservée aux \n"
 "Services Operators."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6764,7 +6718,7 @@ msgstr ""
 "excessivement les jokers entrainent une dégradation des\n"
 "performances des Services."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6780,7 +6734,7 @@ msgstr ""
 "\n"
 "Une raison peut être requise sur certains réseaux."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6796,7 +6750,7 @@ msgstr ""
 "\n"
 "Sur certains réseaux, une raison est requise."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6813,7 +6767,7 @@ msgstr ""
 "\tpour quelle E-mail a été formulée la commande est ajouté\n"
 "\tdans les logs."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6823,7 +6777,7 @@ msgstr ""
 "\n"
 "Retourne la clef du canal donné."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6842,7 +6796,7 @@ msgstr ""
 "\n"
 "Cette commande est indisponible quand le cryptafe est activé."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6873,7 +6827,7 @@ msgstr ""
 "liste d'accès du pseudo, ou vous devez fournir le mot de passe\n"
 "correct pour le pseudo."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6883,7 +6837,7 @@ msgstr ""
 "\n"
 "Liste tous les pseudos dans votre groupe."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6918,7 +6872,7 @@ msgstr ""
 "les utilisateurs du réseau. Le message sera envoyé avec\n"
 "le pseudo %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6930,7 +6884,8 @@ msgstr ""
 "Permet d'enregistrer le vHost du pseudo actuellement\n"
 "utilisé pour tous les pseudos du groupe. "
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6989,7 +6944,7 @@ msgstr ""
 "\n"
 "Note: tous les pseudos du groupe ont le même mot de passe."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7010,7 +6965,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux HOPs ou à ceux ayant un \n"
 "niveau d'accès de 4 ou plus en cas de HalfOP sur soi-même."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7039,16 +6994,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntaxe: HOP canal ADD pseudo\n"
 "         HOP canal DEL {pseudo | liste d'entrées | liste}\n"
@@ -7089,7 +7034,7 @@ msgstr ""
 "d'accès, et /msg %s HELP SET XOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7108,7 +7053,7 @@ msgstr ""
 "mot de passe est celui que vous avez donné avec la commande \n"
 "REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7118,7 +7063,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7152,7 +7097,7 @@ msgstr ""
 "\n"
 "L'ignorance ne fonctionnera pas sur les OPERateurs IRC."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7173,7 +7118,7 @@ msgstr ""
 "Par défaut, l'option ALL est limitée à ceux ayant un accès \n"
 "de propriétaire sur le canal."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7191,7 +7136,7 @@ msgstr ""
 "les informations seront affichées, qu'elles soient cachées\n"
 "ou non."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7207,7 +7152,7 @@ msgstr ""
 "recevoir au total. Avec un paramètre, affiche la même\n"
 "information pour le canal donné."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7234,7 +7179,7 @@ msgstr ""
 "pour le pseudo donné. Cette utilisation réservée aux Services\n"
 "admins."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7255,7 +7200,7 @@ msgstr ""
 "création ou le nombre de canaux auxquels il a été\n"
 "attribué."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7297,7 +7242,7 @@ msgstr ""
 "texte \"Juped by <pseudo>\", laissant apparaître le pseudo\n"
 "de la personne qui a \"jupé\" le serveur."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7312,7 +7257,8 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7338,7 +7284,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7359,8 +7305,8 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7428,7 +7374,7 @@ msgstr ""
 "\n"
 "Réservé aux Services operators."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7446,7 +7392,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7465,7 +7411,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7495,7 +7441,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7514,7 +7460,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7539,7 +7485,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7555,7 +7501,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7574,7 +7520,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7593,7 +7539,7 @@ msgstr ""
 "pas ttb ou mettez le à 0 pour désactiver le système\n"
 "de ban une fois activé."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7644,7 +7590,7 @@ msgstr ""
 "Pour une liste de caractéristiques et fonctions pour lesquels\n"
 "des niveaux peuvent être définis, consultez HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7670,7 +7616,7 @@ msgstr ""
 "du nombre de résultats affichés en une fois.\n"
 "Limité aux Services opérateurs."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7685,7 +7631,7 @@ msgstr ""
 "modèle donné. (Les canaux avec l'option PRIVATE ne\n"
 "sont pas listés.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7727,7 +7673,7 @@ msgstr ""
 "        domaine bar.org.\n"
 "        "
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7784,7 +7730,7 @@ msgstr ""
 "    LIST * NOEXPIRE\n"
 "        Liste tous les pseudos qui n'expireront pas."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7806,11 +7752,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Liste les mémos 2 à 5 et 7 à 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntaxe: LOGONNEWS ADD texte"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7843,7 +7799,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntaxe: LOGONNEWS DEL {num | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7859,7 +7815,7 @@ msgstr ""
 "reconnu en tant que propriétaire réel du pseudo. Notez\n"
 "cependant que l'on ne vous demandera pas de vous réidentifier."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7884,24 +7840,7 @@ msgstr ""
 "au pseudo donné de se ré-identifier. Cette utilisation est \n"
 "réservée aux Services Operators."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntaxe: MODE canal modes\n"
-"\n"
-"Permet aux Services opérateurs de définir les modes d'un\n"
-"canal. Les paramètres sont les mêmes que pour la commande\n"
-"/MODE normale.\n"
-"\n"
-"Réservé aux Services operateurs."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7928,7 +7867,24 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Syntaxe: MODE canal modes\n"
+"\n"
+"Permet aux Services opérateurs de définir les modes d'un\n"
+"canal. Les paramètres sont les mêmes que pour la commande\n"
+"/MODE normale.\n"
+"\n"
+"Réservé aux Services operateurs."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7937,7 +7893,7 @@ msgstr ""
 "Syntaxe: MODINFO Fichier\n"
 "Cette commande donne des informations sur un module chargé."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7946,7 +7902,7 @@ msgstr ""
 "Syntaxe: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Liste les modules actuellement chargés."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7957,7 +7913,7 @@ msgstr ""
 "Cette commande charge le module depuis le fichier situé dans le répertoire\n"
 "des modules."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7968,7 +7924,7 @@ msgstr ""
 "Cette commande charge le module depuis le fichier situé dans le répertoire\n"
 "des modules."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7980,7 +7936,7 @@ msgstr ""
 "répertoire\n"
 "des modules."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -8010,7 +7966,7 @@ msgstr ""
 "vérifié par les Services.\n"
 "Réservé aux administrateurs des Services."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8021,7 +7977,7 @@ msgstr ""
 "Désactive le vhost que vous utilisez actuellement. L'utilisation\n"
 "de cette commande rendra visible votre IP."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8034,7 +7990,7 @@ msgstr ""
 "Permet de mettre un OperFlag à un utilisateur.\n"
 "Préfixes: \"+\" et \"-\". Pour tout supprimer, spécifiez \"-\""
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8046,7 +8002,7 @@ msgstr ""
 "Vous verrez ce vhost dans votre /whois à la place de\n"
 "votre host actuel."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8070,7 +8026,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntaxe: OPERNEWS ADD texte"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8103,7 +8059,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntaxe: OPERNEWS DEL {num | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8122,7 +8078,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau\n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8143,7 +8099,7 @@ msgstr ""
 "ou à ceux ayant un niveau d'accès de 10 ou plus en cas de \n"
 "protection de soi-même."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8172,16 +8128,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8220,7 +8166,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8242,7 +8188,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntaxe: RANDOMNEWS ADD texte"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8268,7 +8214,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntaxe: RANDOMNEWS DEL {num | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8293,7 +8239,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Affiche les mémos 2 à 5 et 7 à 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8341,8 +8288,8 @@ msgstr ""
 "le groupe du pseudo, ou vous devez fournir le mot de passe\n"
 "correct du pseudo."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8384,8 +8331,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8454,7 +8401,7 @@ msgstr ""
 "canaux. Pour plus d'informations sur cette fonction, \n"
 "tapez /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8483,7 +8430,7 @@ msgstr ""
 "le groupe du pseudo, ou vous devez fournir le mot de passe\n"
 "correct du pseudo."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8499,7 +8446,7 @@ msgstr ""
 "(comme le nom des services, l'activation de la limite\n"
 "de sessions, etc.)"
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8512,7 +8459,7 @@ msgstr ""
 "( aussi appelé passcode) à l'adresse E-mail de l'utilisateur\n"
 "qui l'exécute."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8536,7 +8483,7 @@ msgstr ""
 "le redémarrage des Services (c'est à dire qu'elle stoppe\n"
 "le programme et le relance immédiatement)."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8558,7 +8505,7 @@ msgstr ""
 "Une fois le mémo lu, un accusé de réception vous est automatiquement\n"
 "envoyé afin de vous prévenir que le mémo a été lu."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8570,7 +8517,7 @@ msgstr ""
 "Configure plusieurs options sur un pseudo.  option doit être l'une ci-"
 "dessous:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8585,7 +8532,7 @@ msgstr ""
 "Positionnez sur ON pour\tpermettre à ChanServ de le faire quand\n"
 "vous il entre dans un canal."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8598,7 +8545,7 @@ msgstr ""
 "pseudo dans les Services. Le nouvel affichage DOIT être un\n"
 "pseudo de votre groupe."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8608,7 +8555,7 @@ msgstr ""
 "\n"
 "Associe l'E-mail donnée au pseudo."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8624,7 +8571,7 @@ msgstr ""
 "GREET active, à condition d'avoir un niveau d'accès\n"
 "suffisant."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8646,7 +8593,7 @@ msgstr ""
 "raison de /QUIT (QUIT). Le second paramètre indique si\n"
 "l'option doit être affichée (OFF) ou cachée (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8678,25 +8625,7 @@ msgstr ""
 "pour changer son pseudo, n'utilisez cette option que si nécessaire.\n"
 "Les administrateurs de votre réseau peuvent avoir désactivé cette option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Modifie la langue utilisée par Services quand il envoie des messages\n"
-"à nickname (par exemple, quand ils répondent à une commande qu'il\n"
-"a envoyé).\n"
-"number doit être choisi dans la liste des langues supportées que\n"
-"vous pouvez obtenir en tapant /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8710,7 +8639,7 @@ msgstr ""
 "le pseudo donné. Si cette option est activée, ils utiliseront des\n"
 "messages, sinon ils utiliseront des notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8723,7 +8652,7 @@ msgstr ""
 "Configurez ce paramètre sur ON pour que le \n"
 "pseudo n'expire pas."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8735,7 +8664,7 @@ msgstr ""
 "Change le mot de passe utilisé pour s'identifier comme propiétaire\n"
 "du pseudo."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8755,7 +8684,7 @@ msgstr ""
 "tout de même avoir des informations en utilisant\n"
 "la commande INFO)."
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8777,7 +8706,7 @@ msgstr ""
 "ou non. Cependant, si vous êtes sur la liste d'accès, %s ignorera\n"
 "la configuration de la protection offerte par SET KILL."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8787,7 +8716,7 @@ msgstr ""
 "\n"
 "Fait dire au bot le texte donné sur le canal donné."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8804,7 +8733,7 @@ msgstr ""
 "sera informé qu'il/elle a reçu un nouveau mémo. Le pseudo/canal\n"
 "destinataire doit être enregistré."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8814,7 +8743,7 @@ msgstr ""
 "Syntaxe: SENDALL texte\n"
 "Envoie un mémo à tous les pseudos enregistrés contenant le texte."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8833,7 +8762,7 @@ msgstr ""
 "Peut être limité aux Opérateurs IRC sur certains\n"
 "réseaux."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8868,7 +8797,7 @@ msgstr ""
 "concernant la limitation et comment définir les limites de\n"
 "sessions pour certains hôtes et groupes."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8882,7 +8811,7 @@ msgstr ""
 "SET <nick> <ident>@<hostmask>\n"
 "Limité aux Services Opérateurs."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8897,8 +8826,8 @@ msgstr ""
 "Lorsque le contrôle des OPs est actif, les utilisateurs \n"
 "qui ne sont pas sur la liste d'accès ne pourront être OP."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8923,26 +8852,9 @@ msgstr ""
 "génèreront pas de kicks signés. Consultez /msg %s HELP LEVELS\n"
 "pour plus d'informations."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntaxe: %s canal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Active ou désactive l'option de verrouillage du sujet pour\n"
-"un canal. Lorsque le verrouillage du sujet est actif,\n"
-"%s ne permettra pas le changement du sujet du canal sauf\n"
-"avec la commande TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8972,7 +8884,7 @@ msgstr ""
 "Tapez /msg %s HELP SET option pour plus d'infos\n"
 "sur une option spécifique."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8986,7 +8898,7 @@ msgstr ""
 "\n"
 "Réservé aux administrateurs des services."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9002,7 +8914,7 @@ msgstr ""
 "\n"
 "Options disponibles:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9017,7 +8929,7 @@ msgstr ""
 "le bot de kicker les OPs même s'ils sont en-deçà\n"
 "du niveau NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9032,7 +8944,7 @@ msgstr ""
 "le bot de kicker les Voices même s'ils sont en-deçà\n"
 "du niveau NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9067,7 +8979,7 @@ msgstr ""
 "doit avoir suffisamment de permissions pour le\n"
 "niveau OP/DEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9083,7 +8995,7 @@ msgstr ""
 "fait afficher au bot le message d'accueil de chaque\n"
 "utilisateur qui a un accès suffisant au canal."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9098,7 +9010,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9114,7 +9026,7 @@ msgstr ""
 "\n"
 "Réservé aux administrateurs des services."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9126,7 +9038,7 @@ msgstr ""
 "Définit si le canal donné expirera. Mettre ceci sur ON\n"
 "empêche le canal d'expirer."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9144,8 +9056,8 @@ msgstr ""
 "par %s sur les canaux, tels que les MODEs,\n"
 "les KICKs, et même le message d'entrée."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9172,7 +9084,7 @@ msgstr ""
 "Tapez /msg %s HELP SET option pour plus \n"
 "d'informations sur une option spécifique."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9182,7 +9094,7 @@ msgstr ""
 "\n"
 "Configure diverses options du pseudo. option peut être:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9207,7 +9119,7 @@ msgstr ""
 "    IGNORE     Active ou désactive le mode ignore\n"
 "    LIST       Liste les options"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9220,7 +9132,7 @@ msgstr ""
 "Positionnez sur ON pour\tpermettre à ChanServ de le faire quand\n"
 "vous entrez dans un canal."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9233,7 +9145,7 @@ msgstr ""
 "pseudos dans les Services. Le nouvel affichage DOIT être un\n"
 "pseudo de votre groupe."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9247,7 +9159,7 @@ msgstr ""
 "sera affichée lorsque quelqu'un demandera des informations \n"
 "sur votre pseudo avec la commande INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9263,7 +9175,7 @@ msgstr ""
 "GREET active, à condition d'avoir un niveau d'accès\n"
 "suffisant."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9285,7 +9197,7 @@ msgstr ""
 "raison de /QUIT (QUIT). Le second paramètre indique si \n"
 "l'option doit être affichée (OFF) ou cachée (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9318,7 +9230,7 @@ msgstr ""
 "pour changer son pseudo, n'utilisez cette option que si nécessaire.\n"
 "Les administrateurs de votre réseau peuvent avoir désactivé cette option."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9335,7 +9247,7 @@ msgstr ""
 "commande que vous avez envoyé). nombre doit être choisi\n"
 "dans la liste suivante des langues supportées:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9352,7 +9264,7 @@ msgstr ""
 "personne ne pourra vous envoyer de mémo. Cependant, vous\n"
 "ne pouvez pas définir la limite à plus de %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9394,7 +9306,7 @@ msgstr ""
 "ont les privilèges requis, ne peuvent supprimer %d limite, et\n"
 "ne peuvent définir de limite stricte."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9403,7 +9315,7 @@ msgstr ""
 "Syntaxe: SET LIST\n"
 "Afficher diverses options à propos de %s"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9417,7 +9329,7 @@ msgstr ""
 "avec vous. Si cette option est activée, ils utiliseront des\n"
 "messages, sinon ils utiliseront des notices."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9436,7 +9348,7 @@ msgstr ""
 "Cette option est équivalente à l'option de la ligne de commande\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9475,7 +9387,7 @@ msgstr ""
 "\n"
 "ON est la combinaison de LOGON et NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9487,7 +9399,7 @@ msgstr ""
 "Change le mot de passe utilisé pour vous identifier en tant\n"
 "que propriétaire du pseudo."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9507,7 +9419,7 @@ msgstr ""
 "tout de même avoir des informations en utilisant\n"
 "la commande INFO)."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9539,7 +9451,7 @@ msgstr ""
 "Cette option est équivalente à l'option de la ligne de commande\n"
 "-readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9561,7 +9473,7 @@ msgstr ""
 "ou non. Cependant, si vous êtes sur la liste d'accès, %s ignorera\n"
 "la configuration de la protection offerte par SET KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9574,7 +9486,7 @@ msgstr ""
 "\"founder\" de tous les canaux...\n"
 "Utilisation temporaire."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9591,7 +9503,7 @@ msgstr ""
 "SET <pseudo> <ident>@<hostmask>\n"
 "Limité aux Services Opérateurs."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9602,7 +9514,7 @@ msgstr ""
 "Provoque la sauvegarde de toutes les bases de données puis\n"
 "l'arrêt des Services."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9696,7 +9608,7 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des Services."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9726,16 +9638,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntaxe: SOP canal ADD pseudo\n"
 "         SOP canal DEL {pseudo | liste d'entrées | liste}\n"
@@ -9779,7 +9681,7 @@ msgstr ""
 "d'accès, et /msg %s HELP SET AOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9875,7 +9777,7 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des services."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9885,7 +9787,7 @@ msgstr ""
 "Affiche tous les pseudos du staff des services avec leur\n"
 "niveau d'accès et leur statut (online/offline)."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9896,7 +9798,7 @@ msgstr ""
 "Envoie un mémo à tout le staff des services contenant le\n"
 "texte."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9947,7 +9849,7 @@ msgstr ""
 "L'option UPLINK affiche les informations sur le serveur qui est\n"
 "utilisé pour linker Anope au réseau."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9971,7 +9873,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR error-message"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10017,7 +9919,7 @@ msgstr ""
 "le reste sera ignoré. Si aucun pseudo n'est donné, votre propre\n"
 "statut sera retourné."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10035,7 +9937,7 @@ msgstr ""
 "\n"
 "Une raison peut être demandée sur certain réseaux."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10045,7 +9947,7 @@ msgstr ""
 "\n"
 "Force le changement de pseudo d'un utilisateur."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10136,7 +10038,8 @@ msgstr ""
 "\n"
 "Réservé aux OPérateurs des Services."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10160,19 +10063,7 @@ msgstr ""
 "Par défault, limité à ceux ayant un statut de propriétaire\n"
 "du canal."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntaxe: UMODE pseudo modes\n"
-"\n"
-"Permet aux Services Operators de changer un mode d'un utilisateur."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10190,7 +10081,7 @@ msgstr ""
 "de réattribuer un bot plus tard sans avoir à le reconfigurer\n"
 "entièrement."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10209,7 +10100,7 @@ msgstr ""
 "Par défaut, limité aux AOPs ou à ceux ayant un niveau \n"
 "d'accès de 5 ou plus sur le canal."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10226,7 +10117,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10239,7 +10130,7 @@ msgstr ""
 "et configurations seront restaurées tel qu'elles étaient\n"
 "avant la suspension."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10251,7 +10142,7 @@ msgstr ""
 "Provoque la mise à jour de toutes les bases de données dès\n"
 "que vous le demandez."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10273,7 +10164,7 @@ msgstr ""
 "utilisateurs du canal seront listés. +i INVISIBLE est spécifié,\n"
 "seuls les utilisateurs avec le mode +i seront listés."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10295,7 +10186,7 @@ msgstr ""
 "de 5 ou plus sur le canal, ou aux VOPs ou à ceux ayant un \n"
 "niveau d'accès de 3 ou plus en cas de voice sur soi-même."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10324,16 +10215,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntaxe: VOP canal ADD pseudo\n"
 "         VOP canal DEL {pseudo | liste d'entrées | liste}\n"
@@ -10375,7 +10256,7 @@ msgstr ""
 "d'accès, et /msg %s HELP SET AOP pour savoir comment \n"
 "passer du système de liste d'accès à celui de liste des xOPs."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10391,7 +10272,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10399,7 +10280,7 @@ msgstr ""
 "Syntaxe: SUSPEND pseudo raison / UNSUSPEND pseudo\n"
 "Suspend / libère le pseudo spécifié."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10407,7 +10288,7 @@ msgstr ""
 "Syntaxe: UNSUSPEND pseudo\n"
 "Libère un pseudo suspendu."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10420,52 +10301,99 @@ msgstr ""
 "(ModeonID), met\tà jour votre vhost et vos flags\n"
 "(dernière fois vu, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr ""
+"    CLEAR      Ordonne à ChanServ de nettoyer certains paramètres\n"
+"               sur un canal"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Commande à ChanServ de vous inviter dans un canal"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Supprime temporairement toutes les O:lines\n"
+"                d'un serveur"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Arrête les Services avec sauvegarde"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Arrête les Services sans sauvegarde"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "L'option IMMED n'est pas disponible sur ce réseau."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "La liste d'AKILL a été vidée."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Le niveau de DEFCON est maintenant: %d."
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "L'adresse E-mail de %s sera cachée dans la commande INFO de %s."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 "L'adresse email de %s sera maintenant affichée dans la commande INFO de %s."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "La liste de SNLINEs a été vidée."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "La liste de SQLINEs a été vidée."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "La liste de SZLINEs a été vidée."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Le canal %s n'a pas de clé."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10476,36 +10404,36 @@ msgstr ""
 "Notez que les niveaux pour AUTODEOP et NOJOIN sont des niveaux\n"
 "maximum, alors que tous les autres sont des niveaux minimum."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "L'hôte %s a actuellement %d sessions avec une limite de %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Le dernier mémo que vous avez envoyé à %s (le %s) a été lu."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Le dernier mémo que vous avez envoyé à %s (le %s) n'a pas encore été lu."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Le dernier message de quit de %s ne sera plus affiché dans la commande INFO "
 "de %s."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Le dernier message de quit de %s sera affiché dans la commande INFO de %s."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -10514,7 +10442,7 @@ msgstr ""
 "INFO\n"
 "de %s."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -10523,32 +10451,22 @@ msgstr ""
 "INFO\n"
 "de %s."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "La limite de mémos pour %s ne peut être changée."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "Le nouvel affichage pour %s DOIT être un pseudo de son groupe!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Le nouvel affichage est maintenant %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Le pseudo de %s a été changé en %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -10556,19 +10474,19 @@ msgstr ""
 "Le statut sur les services de %s sera maintenant caché dans la commande INFO "
 "de %s."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Le statut sur les services de %s sera maintenant affiché dans la commande "
 "INFO de %s."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Il y a %d mémos sur le canal %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10576,7 +10494,8 @@ msgstr ""
 "Il n'y a aucun bot disponible actuellement.\n"
 "Demandez à un administrateur des services d'en créer un!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10587,20 +10506,12 @@ msgstr ""
 "Tapez /msg %s HELP GLIST et /msg %s HELP DROP pour\n"
 "plus d'informations."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Il y a %d mémo sur le canal %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Il y a un nouveau mémo dans le canal %s.\n"
-"Tapez /msg %s READ %s %d pour le lire."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Il n'y a plus de bot attribué à %s."
@@ -10621,7 +10532,7 @@ msgstr "Il n'y a pas de nouvelles aléatoires."
 msgid "There's no email address set for your nick."
 msgstr "Vous n'avez configuré aucune adresse email pour votre pseudo."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10637,83 +10548,38 @@ msgstr ""
 "    PRIVATE          Empêche un bot d'être attribué par\n"
 "                         des non-opérateurs IRC"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Ce canal a été interdit."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ce canal a été enregistré avec %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Ce canal est suspendu."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Ce canal ne peut être utilisé."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Ce canal n'expirera pas."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Une demande d'enregistrement pour ce pseudo est en cours. Merci de patienter "
-"24 heures."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Une demande d'enregistrement pour ce pseudo est en cours. La confirmation "
-"n'a pas été effectuée."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Ce pseudo appartient à quelqu'un d'autre. Veuillez en changer.\n"
-"(Si c'est votre pseudo, tapez /msg %s IDENTIFY motdepasse.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Ce pseudo a été enregistré, vous ne pouvez pas l'utiliser."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Ce pseudo est actuellement suspendu."
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Ce pseudo est actuellement suspendu, raison: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Ce pseudo est enregistré et protégé. Si c'est votre pseudo,\n"
-"tapez /msg %s IDENTIFY motdepasse. \n"
-"Sinon veuillez choisir un pseudo différent."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Ce pseudo n'expirera pas."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ce pseudo ne peut être utilisé.  Veuillez en choisir un autre."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Ce pseudo n'expirera pas."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10721,30 +10587,62 @@ msgstr ""
 "Pour rechercher des canaux commençant par #, cherchez des des\n"
 "noms de canaux sans le signe # (anope au lieu de #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Change le système de privilèges utilisateurs"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Verrouillage du topic"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Maintien du topic"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr ""
+"    TOPICLOCK     Le sujet peut uniquement être changé avec\n"
+"                      TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Le verrouillage du sujet pour %s est maintenant ACTIF."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Le verrouillage du sujet pour %s est maintenant ACTIF."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Le maintient du topic est maintenant ACTIF sur %s."
+
+#: modules/core/cs_set_keeptopic.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now on."
 msgstr "Le maintient du topic est maintenant ACTIF sur %s."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Cessez d'utiliser tant de majuscules!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
 #, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Active ou désactive la sécurité du pseudo"
+
+#: modules/core/ns_set_kill.cpp:21
+#, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Active ou désactive la protection"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10758,7 +10656,8 @@ msgstr ""
 "    de 10 sur un canal peut lire ces mémos du canal. Ceci\n"
 "    peut être changé avec la commande LEVELS de %s."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10768,7 +10667,8 @@ msgstr ""
 "sur une option spécifique. L'option devra être mise avec le pseudo\n"
 "en préfixe."
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10776,7 +10676,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10784,130 +10685,130 @@ msgstr ""
 "Tapez /msg %s HELP SET option pour plus d'informations sur\n"
 "une option particulière."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Tapez /msg %s SET EMAIL e-mail pour définir votre e-mail.\n"
-"Votre vie privée est respectée, cet e-mail ne sera pas \n"
-"divulgué à des tierces personnes."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Tapez /msg %s LIST NEW pour les lister."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Tapez /msg %s READ %d pour le lire."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Tapez /msg %s READ LAST pour le lire."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE pseudo modes"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Tapez /msg %s SET EMAIL e-mail pour définir votre e-mail.\n"
+"Votre vie privée est respectée, cet e-mail ne sera pas \n"
+"divulgué à des tierces personnes."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND pseudo"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Décharge un module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossible de charger le module %s."
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossible de décharger le module %s."
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Retire le bot d'un canal"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Option SASET %s inconnue."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "L'option SET %s est inconnue."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Option STATS inconnue %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Commande %s inconnue. Tapez \"/msg %s HELP\" pour obtenir de l'aide."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Mode %c ignoré car inconnu."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Option inconnue %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend un pseudo"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Option %s inconnue.\n"
-"Tapez /msg %s HELP SET pour plus d'informations."
+"    UPDATE     Met à jour votre statut, ex : vérification de nouveaux mémos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Mise à jour des bases de données."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Caractéristiques du lien: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Connecté à: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Utilisateur   : %6d enregistrements, %5d ko"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"L'utilisateur se servant de votre pseudo a été déconnecté.\n"
-"/msg %s RELEASE %s pour le récupérer avant que la %s ne s'écoule."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "Utilisateur trouvé dans les exceptions."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10915,16 +10816,35 @@ msgstr ""
 "Liste des utilisateurs:\n"
 "Nick                 Masque"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Le propriétaire de %s est maintenant %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Affiche la liste des sessions par hôte"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Donne un voice au pseudo spécifié sur un canal"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Protection des voices"
 
@@ -10952,16 +10872,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Surveillez votre langage !"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Vous êtes déjà membre du groupe de %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Vous êtes déjà identifié."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "Vous êtes déjà dans %s! "
@@ -10970,11 +10890,7 @@ msgstr "Vous êtes déjà dans %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Vous n'êtes plus SuperAdmin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Vous n'êtes pas autorisé à être sur ce canal."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Vous n'êtes pas autorisé à changer votre limite de mémos."
 
@@ -10982,11 +10898,12 @@ msgstr "Vous n'êtes pas autorisé à changer votre limite de mémos."
 msgid "You are now a SuperAdmin"
 msgstr "Vous êtes maintenant SuperAdmin."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Vous êtes maintenant IRCOp."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10994,45 +10911,46 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Vous êtes maintenant dans le groupe de %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Vous ne pouvez pas recevoir d'accusé de réception quand vous vous\n"
 "ètes envoyé un message à vous-meme."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "Vous pouvez utiliser cette commande."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Vous ne pouvez pas utiliser GHOST sur vous-même!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr ""
 "Vous ne pouvez pas déconnecter %s parce que c'est un administrateur\n"
 "des services."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Vous ne pouvez pas utiliser RECOVER sur vous-même!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11042,7 +10960,8 @@ msgstr ""
 "Utilisez les commandes AOP, SOP et VOP à la place.\n"
 "Tapez /msg %s HELP commande pour plus d'informations."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11053,6 +10972,7 @@ msgstr ""
 "Tapez /msg %s HELP command pour plus d'informations."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11061,56 +10981,66 @@ msgstr ""
 "Utilisez la commandes ACCESS à la place.\n"
 "Tapez /msg %s HELP ACCESS pour plus d'informations."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Vous ne pouvez mettre la limite de mémos de %s à plus de %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Vous ne pouvez mettre votre limite de mémos à plus de %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Vous ne pouvez pas effacer votre e-mail sur ce réseau."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "Vous ne pouvez pas utiliser cette commande."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Vous avez actuellement %d mémos, desquels %d n'ont pas été lus."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Vous avez actuellement %d mémos, desquels 1 n'a pas été lu."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Vous avez actuellement %d mémos."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Vous avez actuellement %d mémos, aucun d'entre-eux n'a été lu."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Vous avez actuellement 1 mémo, qui n'a pas encore été lu."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Vous avez actuellement 1 mémo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Vous n'avez aucun mémo actuellement."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11120,65 +11050,45 @@ msgstr "Vous avez %d nouveaux mémos."
 msgid "You have 1 new memo."
 msgstr "Vous avez 1 nouveau mémo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Vous avez un nouveau mémo de %s.\n"
-"Tapez /msg %s READ %d pour le lire."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Vous avez été invité à rejoindre %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Vous avez été débanni de %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr ""
 "Vous n'avez aucune limite sur le nombre de mémos que vous pouvez garder."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Vous n'avez pas de mémos."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Vous n'avez pas de nouveaux mémos."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Vous devez entrer une durée valide"
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Vous devez attribuer un bot au canal avant d'utiliser \n"
-"cette commande.\n"
-"Tapez /msg %s HELP ASSIGN pour plus d'informations."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Vous devez être un opérateur du canal pour l'enregistrer."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Vous devez être un opérateur du canal pour l'enregistrer."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Vous devez rester connecté plus de %d secondes pour enregistrer votre pseudo."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11188,25 +11098,25 @@ msgstr ""
 "Cet e-mail vous permettra de retrouver votre mot de passe\n"
 "au cas où vous le perdriez."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "Vous devez être identifié pour utiliser cette commande."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Vous serez notifié pour les nouveaux mémos à la connexion et quand ils "
 "arrivent."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Vous serez notifié pour les nouveaux mémos à la connexion."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Vous serez notifié quand de nouveaux mémos arrivent."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Vous ne pourrez désormais plus recevoir de mémos."
 
@@ -11214,7 +11124,7 @@ msgstr "Vous ne pourrez désormais plus recevoir de mémos."
 msgid "You will no longer be informed via email."
 msgstr "Vous ne serez plus averti par mail de l'arrivée de nouveau(x) mémo(s)."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Vous ne serez pas notifié pour les nouveaux mémos."
 
@@ -11223,16 +11133,20 @@ msgid "You will now be informed about new memos via email."
 msgstr ""
 "Vous serez maintenant averti par mail de l'arrivée de nouveau(x) mémo(s)."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr "L'IRCD utilisé ne supporte par la modification de l'ident."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Votre liste d'accès est vide."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Vous êtes déjà identifié."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11248,35 +11162,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Votre liste d'accès est vide."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "L'adresse E-mail pour %s a été changée en %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Toutes les O:lines de %s ont été supprimées."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "La liste des ignorés est vide."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Votre limite de mémos a été désactivée."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Votre limite de mémos a été fixée à %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Votre limite de mémos est de %d, et ne peut être changée."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Votre limite de mémos est de %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Votre limite de mémos est de 0, vous ne recevrez aucun nouveau mémo."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11284,63 +11219,57 @@ msgstr ""
 "Votre limite de mémos est de 0, vous ne recevrez aucun nouveau mémo.  Vous "
 "ne pouvez pas changer cette limite."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Votre pseudo n'est plus identifié."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Votre pseudo est déjà enregistré, tapez /msg %s DROP d'abord."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Votre pseudo n'est pas enregistré."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Votre pseudo a été effacé."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Votre pseudo est maintenant changé en %s."
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Votre mot de passe a été renvoyé à %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Votre mot de passe est %s - notez-le pour une utilisation ultérieure."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr ""
-"Votre mot de passe est trop long. Veuillez réessayer avec un mot de passe "
-"plus court."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Votre vhost %s est activé."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Votre vhost %s@%s est activé."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11359,94 +11288,95 @@ msgstr "[Oper News - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[News Aléatoire - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "n'expire pas"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "expire à la prochaine mise à jour de la base de données"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "expire dans %d jour"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "expire dans %d jours"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expire dans %d heure, %d minute"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expire dans %d heure, %d minutes"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expire dans %d heures, %d minute"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expire dans %d heures, %d minutes"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "expire dans %d minute"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expire dans %d minutes"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Le vhost pour %s a été supprimé."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Le vhost pour %s enregistrée en %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Le vhost pour %s enregistrée en %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Le vhost pour le groupe %s enregistrée en %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Le vhost pour le groupe %s enregistrée en %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Le vhost pour le groupe %s a été supprimé."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Système de listes de xOPs"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "Le système de xOP est maintenant ACTIF sur %s."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "Le système de xOP est maintenant ACTIF sur %s."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "Le système xOP n'est pas disponible."
 
@@ -11455,573 +11385,3 @@ msgstr "Le système xOP n'est pas disponible."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {pseudo | canal} texte-du-memo"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s ajouté à la liste des AOPs de %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s ajouté à la liste des HOPs de %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s ajouté à la liste des SOPs de %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s ajouté à la liste des VOPs de %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s supprimé de la liste des HOPs de %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s supprimé de la liste des SOPs de %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s supprimé de la liste des VOPs de %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s a été déplacé dans la liste des HOPs de %s."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s a été déplacé dans la liste des SOPs de %s."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s a été déplacé dans la liste des VOPs de %s."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s introuvable sur la liste des HOPs de %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s introuvable sur la liste des SOPs de %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s introuvable sur la liste des VOPs de %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Défini la langue que Services utilisera dans les messages\n"
-#~ "               qu'il vous envoie."
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Empêche votre pseudo d'être affiché par\n"
-#~ "                   /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d jours"
-
-#~ msgid "%d hours"
-#~ msgstr "%d heures"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minutes"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d secondes"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "La liste des HOPs de %s est vide."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "La liste des SOPs de %s est vide."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "La liste des VOPs de %s est vide."
-
-#~ msgid "1 day"
-#~ msgstr "1 jour"
-
-#~ msgid "1 hour"
-#~ msgstr "1 heure"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minute"
-
-#~ msgid "1 second"
-#~ msgstr "1 seconde"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Autorisé à utiliser la commande CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Autorisé à utiliser les commandes HALFOP/DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "La liste des HOPs de %s est maintenant vide."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "La liste des SOPs de %s est maintenant vide."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "La liste des VOPs de %s est maintenant vide."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d entrées supprimées de la liste des HOPs de %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d entrées supprimées de la liste des SOPs de %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d entrées supprimées de la liste des VOPs de %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 entrée supprimée de la liste des HOPs de %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 entrée supprimée de la liste des SOPs de %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 entrée supprimée de la liste des VOPs de %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Votre adresse e-mail a été effacée."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [pseudo [level] | liste-d'entrées]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Fin de la liste des utilisateurs."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Le message d'entrée de %s a été effacé."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Le bot n'est pas sur le canal %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "    Message d'entrée: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "La liste d'accès de %s est vide."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Liste d'accès de %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Le message d'entrée de %s a été changé."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "La fantaisie est maintenant désactivée sur le canal %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Le message d'accueil est maintenant désactivé sur le canal %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Liste des HOPs de %s:\n"
-#~ "  Num  Pseudo"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Erreur interne - impossible d'effectuer la commande."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Article de logon news #%d supprimé."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Le pseudo %s n'est pas enregistré."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Enregistrement d'un pseudo (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Mot de passe du pseudo %s"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Aucun # trouvé devant le nom du canal."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Le mode sans bot est maintenant désactivé sur le canal %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Aucune entrée correspondante sur la liste des HOPs de %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Aucune entrée correspondante sur la liste des SOPs de %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Aucune entrée correspondante sur la liste des VOPs de %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Entrée inexistante (#%d) sur la liste des AOPs de %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Entrée inexistante (#%d) sur la liste des HOPs de %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Entrée inexistante (#%d) sur la liste des SOPs de %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Entrée inexistante (#%d) sur la liste des VOPs de %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr ""
-#~ "L'option 'op-notice' est maintenant INACTIVE sur\n"
-#~ "%s."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Le mode 'paix' est INACTIF pour %s."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Veuillez patienter %d secondes avant d'utiliser la commande SEND à "
-#~ "nouveau."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Le mode privé du bot %s est maintenant désactivé."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "L'option 'privé' pour %s est maintenant INACTIVE."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "L'option 'privé' est maintenant INACTIVE pour %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "La protection est maintenant INACTIVE pour %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "La protection est maintenant activée, sans délai."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER motdepasse [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Les restrictions d'accès pour %s sont maintenant INACTIVES."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Liste des SOPs de %s:\n"
-#~ "  Num  Pseudo"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "ERREUR : Le canal %s n'est pas enregistré."
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND canal [raison]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "L'option de sécurité du propriétaire pour %s est INACTIVE."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "La sécurité des OPs sur %s est maintenant INACTIVE."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "L'option de sécurité pour %s est INACTIVE."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "L'option de sécurité est maintenant INACTIVE pour %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Les Services ne peuvent changer les modes. Vos serveurs sont-ils "
-#~ "configurés correctement?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Les services tournent depuis %d jour, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Les services tournent depuis %d heure, %d minute"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Les services tournent depuis %d heure, %d minutes"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Les services tournent depuis %d heures, %d minute"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Les services tournent depuis %d minute, %d seconde"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Les services tournent depuis %d minute, %d secondes"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Les services tournent depuis %d minutes, %d seconde"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Les kicks ne seront plus signés sur %s."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Désolé, la modification des listes des HOPs des canaux est temporairement "
-#~ "désactivée."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Désolé, la modification des listes des SOPs des canaux est temporairement "
-#~ "désactivée."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Désolé, la modification des listes des VOPs des canaux est temporairement "
-#~ "désactivée."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Désolé, vous ne pouvez avoir que %d entrées sur les listes des AOPs/SOPs/"
-#~ "VOPs d'un canal."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "La symbiose est maintenant désactivée sur le canal %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Syntaxe: RANDOMNEWS ADD texte"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR canal raison"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Syntaxe: OPERNEWS ADD texte"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Syntaxe: SET DEBUG {ON | OFF | nombre}\n"
-#~ "\n"
-#~ "Active ou désactive le mode debug. Dans le mode debug toutes\n"
-#~ "les données envoyées vers et par les Services ainsi qu'un bon\n"
-#~ "nombre d'autres messages de déboguage sont écrits dans le \n"
-#~ "fichier de log. Si nombre est donné, le mode debug est activé,\n"
-#~ "avec le niveau de déboguage équivalent à nombre.\n"
-#~ "\n"
-#~ "Cette option est équivalente à l'option de la ligne de commande\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Syntaxe: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Le message d'accueil de %s a été effacé."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "Ce module ne peut pas être déchargé."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Le verrouillage du sujet pour %s est maintenant INACTIF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Le maintient du topic est maintenant INACTIF sur %s."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Commande %s inconnue."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Option %s inconnue.\n"
-#~ "Tapez /msg %s HELP KICK pour plus d'informations."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr ""
-#~ "L'utilisateur %s n'a pas été trouvé dans la base de données de NickServ."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Liste des VOPs de %s:\n"
-#~ "  Num  Pseudo"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Le bot %s a été supprimé."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] Le mémo que vous avez envoyé a %s a été vu."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Le dernier mémo envoyé à %s a été supprimé."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Votre vhost %s est activé."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Le bot %s a été supprimé."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "Le système de xOP est maintenant INACTIF sur %s."
diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po
index 3bae6f760..994fbe43d 100644
--- a/language/anope.hu_HU.po
+++ b/language/anope.hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:37-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Hungarian\n"
@@ -16,95 +16,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s bõvebb információért."
-
-#: modules/core/ns_help.cpp:33
-msgid ""
-"%s allows you to \"register\" a nickname and\n"
-"prevent others from using it. The following\n"
-"commands allow for registration and maintenance of\n"
-"nicknames; to use them, type %s%s command.\n"
-"For more information on a specific command, type\n"
-"%s%s HELP command."
-msgstr ""
-"%s lehetõséget nyújt a \"register\" parancs használatával\n"
-"a nickneved regisztrálására, ezzel megelõzi, hogy más is\n"
-"használhassa a nicked. A NickServ parancsokkal\n"
-"írányítható. Az adott parancs szintaktikáját megkapod, ha\n"
-"beírod, hogy: /msg %s parancs, lásd még a\n"
-"/msg %s HELP parancs."
-
-#: modules/core/bs_help.cpp:35
-msgid ""
-"%s allows you to have a bot on your own channel.\n"
-"It has been created for users that can't host or\n"
-"configure a bot, or for use on networks that don't\n"
-"allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
-msgstr ""
-"%s lehetõvé teszi, hogy botod legyen a csatornádon.\n"
-"Ezt olyan felhasználók számára készítették, akik\n"
-"nem tudnak saját botot futtatni, vagy a hálózaton nem\n"
-"engedélyezik ezt. Az elérhetõ parancsok listája alább \n"
-"található; használatukhoz írd be /msg %s parancs.\n"
-"Bõvebb információt így kaphatsz az adott parancsról:\n"
-"/msg %s HELP parancs."
-
-#: modules/core/cs_help.cpp:35
-#, fuzzy
-msgid ""
-"%s allows you to register and control various\n"
-"aspects of channels. %s can often prevent\n"
-"malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges. Available\n"
-"commands are listed below; to use them, type\n"
-"%s%s command. For more information on a\n"
-"specific command, type %s%s HELP command."
-msgstr ""
-"%s lehetõséget ad arra, hogy regisztráld a csatornádat.\n"
-"%s használatával elkerülhetõ a \"take over\" jelenség,\n"
-"amit az opjoggal visszaélõ userek okozhatnak. Még pedig\n"
-"úgy, hogy meghatározható az, hogy ki kapjon a csatornán\n"
-"operátori kiváltságokat. A parancsok használatához írd be:\n"
-"/msg %s parancs, ha több információ kell a paranccsal\n"
-"kapcsolatban, akkor írd be: /msg %s HELP parancs.\n"
-" "
-
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s lehetõséget nyújt az IRC felhasználókank, hogy rövid\n"
-"üzeneteket küldjenek más IRC felhasználók részére,\n"
-"akkor is, ha a fogadó fél nem online, és csatornákra (*).\n"
-"Ahhoz, hogy üzenetet lehessen küldeni, mind a küldõ és a\n"
-"fogadó fél nicknevének regisztráltnak kell lennie.\n"
-"\t\n"
-"%s parancsok a következõket tartalmazzák:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s módosította DEFCON a szintet erre: %d"
 
-#: modules/core/cs_access.cpp:238
+#: modules/core/cs_access.cpp:244
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 "%s hozzáadva a %s hozzáférési listájához.\n"
 "A hozzáférési szintje a ChanServ parancsokhoz:  %d."
 
-#: modules/core/cs_akick.cpp:281
+#: modules/core/cs_akick.cpp:280
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s hozzáadva a (%s) csatorna autokick listájához"
@@ -139,61 +63,127 @@ msgstr "%s hozzáadva az SZLINE listához."
 msgid "%s added to your access list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
 
-#: modules/core/ms_ignore.cpp:54
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s hozzáadva a hozzáférési listádhoz."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s hozzáadva a hozzáférési listádhoz."
+
+#: modules/core/ms_ignore.cpp:55
 #, fuzzy, c-format
 msgid "%s added to your ignore list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
 
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s allows you to \"register\" a nickname and\n"
+"prevent others from using it. The following\n"
+"commands allow for registration and maintenance of\n"
+"nicknames; to use them, type %s%s command.\n"
+"For more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s lehetõséget nyújt a \"register\" parancs használatával\n"
+"a nickneved regisztrálására, ezzel megelõzi, hogy más is\n"
+"használhassa a nicked. A NickServ parancsokkal\n"
+"írányítható. Az adott parancs szintaktikáját megkapod, ha\n"
+"beírod, hogy: /msg %s parancs, lásd még a\n"
+"/msg %s HELP parancs."
+
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to have a bot on your own channel.\n"
+"It has been created for users that can't host or\n"
+"configure a bot, or for use on networks that don't\n"
+"allow user bots. Available commands are listed \n"
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s lehetõvé teszi, hogy botod legyen a csatornádon.\n"
+"Ezt olyan felhasználók számára készítették, akik\n"
+"nem tudnak saját botot futtatni, vagy a hálózaton nem\n"
+"engedélyezik ezt. Az elérhetõ parancsok listája alább \n"
+"található; használatukhoz írd be /msg %s parancs.\n"
+"Bõvebb információt így kaphatsz az adott parancsról:\n"
+"/msg %s HELP parancs."
+
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to register and control various\n"
+"aspects of channels. %s can often prevent\n"
+"malicious users from \"taking over\" channels by limiting\n"
+"who is allowed channel operator privileges. Available\n"
+"commands are listed below; to use them, type\n"
+"%s%s command. For more information on a\n"
+"specific command, type %s%s HELP command."
+msgstr ""
+"%s lehetõséget ad arra, hogy regisztráld a csatornádat.\n"
+"%s használatával elkerülhetõ a \"take over\" jelenség,\n"
+"amit az opjoggal visszaélõ userek okozhatnak. Még pedig\n"
+"úgy, hogy meghatározható az, hogy ki kapjon a csatornán\n"
+"operátori kiváltságokat. A parancsok használatához írd be:\n"
+"/msg %s parancs, ha több információ kell a paranccsal\n"
+"kapcsolatban, akkor írd be: /msg %s HELP parancs.\n"
+" "
+
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "A %s szót már tartalmazza a %s tiltott szavak listája"
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s már szerepel a (%s) csatorna autokick listáján."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s már bekapcsolva az AKILL lista."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s már szerepel az SNLINE listán."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s már szerpel az SQLINE listán."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s már szerepel az SZLINE listán."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s nem fogadható el banolási idõnek."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s váltóztatott a módodon."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -207,42 +197,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s törölve lett a %s AOP listáról."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s törölve lett a (%s) csatorna hozzáférési listájáról."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s törölve a (%s) csatorna autokick listájáról."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "A %s szó törölve %s tiltott szavak listájából."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s törölve a session-korlát kivétel listáról."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s törölve az AKILL listáról."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s törölve az SNLINE listáról."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s törölve az SQLINE listáról."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s törölve az SZLINE listáról."
@@ -252,69 +242,80 @@ msgstr "%s törölve az SZLINE listáról."
 msgid "%s deleted from your access list."
 msgstr "%s törölve a hozzáférési listádról."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s törölve a hozzáférési listádról."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s törölve a hozzáférési listádról."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s letiltva a (%s) csatornán."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s részére túl sok csatorna van regisztrálva."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s lehetõséget nyújt az IRC felhasználókank, hogy rövid\n"
+"üzeneteket küldjenek más IRC felhasználók részére,\n"
+"akkor is, ha a fogadó fél nem online, és csatornákra (*).\n"
+"Ahhoz, hogy üzenetet lehessen küldeni, mind a küldõ és a\n"
+"fogadó fél nicknevének regisztráltnak kell lennie.\n"
+"\t\n"
+"%s parancsok a következõket tartalmazzák:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s van már %s ilyen bejegyzés."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s nem érvényes ban típus."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s nem érvényes bot vagy regisztrált szoba."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s nem érvényes e-mail cím."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s jelenleg nincs a %s szobában ."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s nick nem található a mellõzöttek listáján."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr "%s megegyezik egy kivétellel (%s) nem tiltható, amíg a kivétel él."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -325,12 +326,12 @@ msgstr "%s  áthelyezve a %s AOP listára."
 msgid "%s not found on %s %s list."
 msgstr "%s nem találatható a %s AOP listán."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s nem található a (%s) csatorna hozzáférési listáján."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s nem szerepel a (%s) csatorna autokick listáján."
@@ -340,32 +341,32 @@ msgstr "%s nem szerepel a (%s) csatorna autokick listáján."
 msgid "%s not found on %s bad words list."
 msgstr "A %s szó nem található a %s tiltott szavak listáján."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s nincs a session listán."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s nem található a session-korlát kivétel listán."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s nem található az AKILL listán."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s nincs a SNLINE listán."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s nnem található az SQLINE listán."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s nem található az SZLINE listán."
@@ -375,12 +376,17 @@ msgstr "%s nem található az SZLINE listán."
 msgid "%s not found on your access list."
 msgstr "%s nem található a hozzáférési listádon."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s nem található a hozzáférési listádon."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s törölve a hozzáférési listádról."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -404,16 +410,12 @@ msgstr "%s nick most mellõzte %s nicket."
 msgid "%s will now permanently be ignored."
 msgstr "%s nick most véglegesen mellõzve van."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Üzenet:Minden %s-nek küldött parancs naplózva van."
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr "Megjegyzés: A Szervíz csak olvasás módban fut!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -421,11 +423,12 @@ msgstr ""
 "Emlékeztetõ: AKILL maszk nem tartalmazhat nicknevet;\n"
 "ellenõrizd, hogy nem tartalmazhat nick részt a maszk."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Emlékeztetõ:Te hozzáadhatsz IP maszkot SZLINE listához."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -475,22 +478,22 @@ msgstr "[auto-memo] A memo, amit küldtél meg lett tekintve."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER jelszó email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER jelszó email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP célnick jelszó"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -509,7 +512,7 @@ msgstr ""
 "visszaélés jutalma minimum az visszaélõ nickjének\n"
 "elvesztése."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -521,7 +524,8 @@ msgstr ""
 "hogy a szoba jelszót használnának, és megnézhetika az\n"
 "access, AKICK, és beállitási szint listát a csatornán."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -532,983 +536,343 @@ msgstr ""
 "beazonosíttotak a nicknevükre, és megnézhetik a nickek\n"
 "hozzáférési listáját. (/msg %s ACCESS LIST nick)"
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "\tBeállítások: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "vhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Bot név: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "Bot név: nincs társítva még."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "Opciók: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "\tCaps Lockért kirúgás : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "\tCaps Lockért kirúgás: %s (%d kirúgás után kitiltás; min. %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "\tCaps Lockért kirúgás: %s (minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "    Tulajdonos: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "    Ban típus: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "\tFélkövér betûkért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "\tFélkövér betûkért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "\tFloodért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "\tFloodért kirúgás: %s (%d kirúgás után kitiltás; %d sor %ds mp alatt)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "\tFloodért kirúgás: %s (%d sor %ds mp alatt)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "Maszk : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "\tSzinezésért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "\tSzinezésért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "    Ban típus: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "    Utoljára használva: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "\tRögzített módok: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "\tIsmétlésért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "\tIsmétlésért kirúgás: %s (%d kirúgás után kitiltás; %d idõre)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "\tIsmétlésért kirúgás : %s (%d alkalommal)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "    Jogutód: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr " Felfüggesztve: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "\tCaps Lockért kirúgás : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "\tFélkövér betûkért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "\tItalics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "\tItalics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "    Utolsó topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "    Regisztrálás ideje: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (letiltva)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (csak foundernek)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     A hozzáférési lista módosítása"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     A szoba hozzáférési listájának beállítása"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Szerkeszti az AKILL listát"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        AutoOperátor lista beállítása"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Társít egy botot a csatornához"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Szerkeszti a tiltott szavak listáját"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       A banolás tipusának beállítása"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Karbantartja a hálózat botjainak listáját"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Listázza az elérhetõ botokat"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Visszavonja az utoljára küldött memot"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL az összes usert a csatornáról"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Listázza az összes csatornát "
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Ellenõrzi, hogy a címzett elolvasta-e már az üzit"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "Született: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulálja a DefCon rendszert"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Törli egy felhasználónak a vhostját"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Törli a megadott üzenete(ke)t"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Törli a vhosztot a nickekröl a csoportban"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          A szobameghatározás állítás"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Set the display of your group in Services"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Törölheted a csatornád regisztrációját"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Nicknév regisztrációjának törlése"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "    Leírás: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Egy E-mail cím társítása a nicknevedhez"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Módosítja a session-korlát/kivétel listát"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Megakadályozza a szoba használatát"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Megelõzi, hogy a nicknév regisztrált legyen"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       A founder megváltoztatása"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Kiírja az ilyen e-mail címmel regisztrált\n"
-"               felhasználókat"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Kiirja a jeszavát a nicknévnek\n"
-"               (encryption esetén nem használható)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Üzenetet küld összes felhasználónak"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Köszöntõ üzenet társítása a nicknevedhez"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       A vhostot a csoport minden tagjára állítja"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Csatlakozás egy csoporthoz"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Köszöntõ üzenet: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       A nicknévhez tartozó információk elrejtése"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Jelszavas azonosítás"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Kiírja az üzenetekkel kapcsolatos információkat"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        Létrehoz egy \"Jupiter\" álszervert."
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     Topic megtartása ha a szoba nincs használatban"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Konfigurálja a kirúgásokat"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kirúgja a felhasználót csatornáról"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       A kill védelem be-,kikapcsolása"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr "    LANGUAGE   A szervíz nyelvezetének megválasztása"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Átállíthatod a szoba hozzáférési szintjeit"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Kiír egy vagy több vhost bejegyzést"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Megjeleníti az üzenetek listáját"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr "    LOGONNEWS   Fellépõ üzenetek beállítása"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Váltóztatja a szoba módot"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Törli a szoba módot"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Információ a betöltött modulokról"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Listázza a betöltött modulokat"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Betölti a modult"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Betölti a modult"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Kitölti a modult"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Megváltoztatja a szervízzel való kommunikációt"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Ideiglenesen törli az összes O:line-t a szerver\n"
-"                távollétében"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Kikapcsolja a társított vhostot"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Operflaget ad a biztos felhasználónak"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Aktiválja a társított vhostot"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS    Operek részére megjelenõ üzenetet állít be"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr "    OPNOTICE      Üzenetet küld az OP/VOICE parancsok használtáról"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "Beállításai: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Set your nickname password"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Szabályozza a kritikus parancsok használatát"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       A szoba elrejtése a listából"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Leállítja a szervíz programot mentés nélkül"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Véletlenszerûen megjelenõ üzenetet állít be \n"
-"                a felhasználók részére"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Elolvassa a megadott üzenete(ke)t"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Killeli a nickedet használó usert"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Nicknév regisztráció"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Nicknév regisztráció"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE    Visszaadja a neved a RECOVER után"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Menti az adatbázist, és újraindítja a szervízt"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Restrict access to the channel"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Memo üzenetet küld és olvasási visszaigazolást kér"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "\tVisszafelé írásért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "\tVisszafelé írásért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Aktiválja a %s biztonsági lehetõségeit"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER Csatornán a founder státusz szigorú kezelése"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     A csatornán az op státusz szigorú kezelése"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Üzenetet küld egy nicknek vagy csatornára"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL Memo küldése minden regisztrált felhasználónak."
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Elfelejtetted a jelszavad? Próbáld ezt"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Olvassa a sessionok hoszt listáját"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Konfigurálja a bot opcióit"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Beállít egy vhosztot a felhasználónak"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Beállítja szervíz általános változóit"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Beállíthatod a csatornád opcióit"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Opciók beállítása, például kill védelem"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Üzenetekkel kapcsolatos beállításokat hajt végre"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Beállítja a vhosztot összes nicknek a csoportban"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Leállítja a szervíz programot mentéssel"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Sign kickek, melyek a KICK paranccsal történnek"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Szerkeszti az SNLINE listát"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        SzuperOperátor lista beállítása"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Szerkeszti az SQLINE listát"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Kijelzi a szervízt és aktív állapotát"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF Memo küldése minden opernek/adminnak."
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Mutatja a Szervít és hálózat állapotát"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Kiírja a felhasználó aktuális hozzáférési\n"
-"               szintjét a megadott csatornán"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     A successor megadása"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Felfüggeszti a szoba használatát de\n"
-"               megõrzi az adatokat és beállításokat."
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Megváltoztatja a felhasználó nicknevét"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Szerkeszti az SZLINE listát"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Témaváltás letiltása "
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Felhasználó módok állítása"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Törli a suspendet a csatornáról."
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      A Szervíz adatbázist frissíti, felülírja\n"
-"                lemezre közvetlenül"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Listázza az összes felhasználót  "
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Használva: %d szobában"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Xop (Sop, Aop, Hop, Vop) lista rendszer bekapcsolása"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "\tCsúnya szavakért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "\tCsúnya szavakért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "E-mail cím: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "Jelenleg online errõl a címrõl: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "Utoljára ekkor volt: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "    A témát beállította: %s"
@@ -1518,20 +882,6 @@ msgstr "    A témát beállította: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1542,26 +892,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c %-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c %-20s %-8s  %s"
@@ -1571,99 +912,82 @@ msgstr "  %3d %c %-20s %-8s  %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "Valódi neve: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Regisztrálás ideje: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "\tAláhúzásért kirúgás: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "\tAláhúzásért kirúgás: %s (%d kirúgás után kitiltás)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Sorszám  Küldõ            Dátum/Idõ"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        Létrehoz egy \"Jupiter\" álszervert."
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (%s által, ekkor: %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1682,17 +1006,12 @@ msgstr ""
 "%5d (%s %s által)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "%s parancsok:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s nem kért értesítést az üzeneteirõl."
@@ -1702,34 +1021,34 @@ msgstr "%s nem kért értesítést az üzeneteirõl."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c %3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (%s által, ekkor: %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modul betöltve."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d botok rendelkezésre állnak."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicknév van a csoportban."
@@ -1740,14 +1059,14 @@ msgstr "%d nicknév van a csoportban."
 msgid "%s %s list is empty."
 msgstr "%s AOP listája üres."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s hozzáférési listája üres."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s autokick listája üres."
@@ -1757,7 +1076,7 @@ msgstr "%s autokick listája üres."
 msgid "%s bad words list is empty."
 msgstr "%s tiltott szavak listája üres."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s nem lehet a %s csatorna successora, mert õ a founder is."
@@ -1767,47 +1086,47 @@ msgstr "%s nem lehet a %s csatorna successora, mert õ a founder is."
 msgid "%s cannot receive memos."
 msgstr "%s nem fogadhat üzeneteket."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "%s parancsok:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "%s túl tág tartományra vonatkozik."
+msgid "%s commands:"
+msgstr "%s parancsok:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s számára %d üzenet érkezett, ebbõl %d olvasatlan."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s számára %d üzenet érkezett, ebbõl 1 olvasatlan."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s számára %d üzenet érkezett."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s számára %d üzenet érkezett, és mind olvasatlan."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s listáján van 1 olvasatlan üzenet."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s listáján van 1 üzenet."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s üzenetlistája üres."
@@ -1817,47 +1136,27 @@ msgstr "%s üzenetlistája üres."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s túl sok üzenettel rendelkezik, és nem fogadhat többet."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s korlátlan számú üzenetet fogadhat."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s üzenetlistája üres."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s nem kapott új üzenetet."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s az %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s jelenleg offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s jelenleg online."
@@ -1879,22 +1178,22 @@ msgstr "%s is enable"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s már nem Szuper-Admin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s nem kért értesítést az üzeneteirõl."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr "%s értesítést kért csatlakozáskor,és ha új üzenete van,"
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s kérte, csatlakozáskor értesítést kapjon,üzeneteirõl."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s értesítést kért, ha új üzenete érkezik."
@@ -1913,6 +1212,11 @@ msgstr ""
 "%s AOP listája:\n"
 "  Sorszám  Nicknév"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1950,63 +1254,66 @@ msgstr "%s értesít az üzenetekrõl csatlakozáskor/AWAY OFF-kor."
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) hozzáadva a bot listához."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s max. fogadható üzenteinek száma: %d, és ez fix érték."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s maximálisan fogadható üzeneteinek száma: %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL minden új kliensre csatlakozáskor."
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Beállítja a következõ módokat: (%s) az összes csatornán."
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Mellõzve minden nem operátortól jövõ üzenet"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killelve lesz minden új felhasználó csatlakozásnál. "
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Nincs MLOCK módosítás"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Nem lehet új csatornát regisztrálni."
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Nem lehet új memot küldeni"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Nem lehet új nicket regisztrálni."
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Csendes mellõzés, csak operátorok"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Használva a csökkentett session korlát: %d."
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<ismeretlen>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Egy massmemo elküldve minden regisztrált felhasználónak."
 
@@ -2019,40 +1326,31 @@ msgstr ""
 "Az értesítõ üzenet %s részére el lett küldve, informálva\n"
 "õt arról, hogy elolvastad a memoját."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "A kód a %s címre lett küldve, írd be /msg %s confirm <kód> a regisztráció "
 "befejezéséhez."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "A vhost identnek érvényes formátumúnak kell lenni."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "A vhost hosztmaszknak érvényes formátumban kell lennie."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS #szoba { ADD | DEL | LIST | VIEW | CLEAR } [ nick [ szint ] | "
 "sorszám ]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [maszk]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT #szoba szöveg"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [maszk]"
@@ -2066,19 +1364,24 @@ msgstr ""
 "AKICK #szoba {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR}"
 "[ nick-maszk ] [ indok ]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "Az AKICK ENFORCE a(z) %s csatornán teljesítve;\n"
 "%d user eltávolítva."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL az összes usert a csatornáról"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "AKILL lista üres."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2087,43 +1390,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+lejárat] {maszk | sorszám} "
 "[indok]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN #szoba nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Hozzáférés megtagadva."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "%s hozzáférése a (%s) csatornán változott: %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "%s hozzáférési szintje a (%s) csatornán : %d"
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "A hozzáférési szintnek %d és %d között kell lennie."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "A hozzáférési szint nem lehet nulla."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "%s hozzáférési szintjeinek beállításai:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "%s szintjei visszaállítva az alapértékekre."
@@ -2138,20 +1432,11 @@ msgstr "Access list for %s is empty."
 msgid "Access list for %s:"
 msgstr "%s hozzáférési listája:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"%s hozzáférési listája:\n"
-"  Sorszám   Szint  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Hozzáférési lista:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2160,6 +1445,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Aktiválja a %s biztonsági lehetõségeit"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Aktiválja a társított vhostot"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2180,7 +1475,7 @@ msgstr "Hozzáadva az új oper hír:(#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Hozzáadva az új random news tétel (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2193,22 +1488,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Összes O:lines %s módosítva."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Összes O:lines %s újra aktív."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
@@ -2217,12 +1512,12 @@ msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 msgid "All logon news items deleted."
 msgstr "Összes fellépési hír tétel törölve."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Minden üzenetet töröltem a %s csatornán."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Minden üzenetet töröltem."
 
@@ -2234,22 +1529,22 @@ msgstr "Összes oper hír törölve."
 msgid "All random news items deleted."
 msgstr "Összes random news tétel törölve."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "A (%s) csatornáról minden felhasználó ki lett rúgva."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Az összes user vhosztja a(z) %s csoportba %s@%s lett"
@@ -2371,12 +1666,34 @@ msgstr "Használhatja a fantasia parancsokat."
 msgid "Allowed to view the access list"
 msgstr "Megtekintheti a hozzáférési listát."
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Társít egy botot a csatornához"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Köszöntõ üzenet társítása a nicknevedhez"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Egy E-mail cím társítása a nicknevedhez"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "%s autokick listája:"
@@ -2401,18 +1718,18 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Automatikus voice (+v) státusz (hangadás)"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS #szoba{ADD|DEL|LIST|CLEAR}[szó|sorszám]\n"
 "[SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2431,26 +1748,26 @@ msgstr ""
 "%s tiltott szavak listája:\n"
 "  Szám   szó                           tipus"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Tiltott szó lista üres."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "A megadott csatorna (%s) új ban típusa: #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "%s nevû bot már létezik."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "%s nevû bot nem létezik."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "A %s nevû bot társítva a %s szobához."
@@ -2465,27 +1782,27 @@ msgstr "A %s nevû bot megváltoztatva %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "A %s nevû bot törölve."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "A %s nevû bot már társítva van a %s szobához."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "A Bot most már opot is kirúg a %s szobából."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "A Bot most már a hangadókat is kirúgja a %s szobában."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "A Bot nem fog opot kirúgni a %s szobából."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "A Bot nem fogja a hangadókat kirúgni a %s szobában."
@@ -2515,16 +1832,11 @@ msgstr "Bot Ident csak érvényes karaktereket tartalmazhat."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nick csak érvényes karaktereket tartalmazhat."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "A Bot nincs a %s csatornán."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Botok listája:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2533,7 +1845,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2544,7 +1856,7 @@ msgstr ""
 "%d kirúgás után a usert. Használd a BADWORDS parancsot\n"
 "hogy hozzáadj vagy törölj tiltott szavakat a listából."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2552,7 +1864,7 @@ msgstr ""
 "Bot kirúgja tiltott szó használatáért. Használd a BADWORDS\n"
 "parancsot hogy hozzáadj vagy törölj tiltott szavakat a listából."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2561,11 +1873,11 @@ msgstr ""
 "A Bot kirúgja félkövér betû használat miatt, és \n"
 "kitiltja %d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "A Bot kirúgja félkövér betû használat miatt a usert."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2576,7 +1888,7 @@ msgstr ""
 "%d karakter és ennek %d%%-a nagybetû), kitiltja \n"
 "%d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2585,7 +1897,7 @@ msgstr ""
 "Bot most már kirúgja caps lock miatt a usert (legalább\n"
 "%d karakter és ennek %d%%-a nagybetû)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2594,11 +1906,11 @@ msgstr ""
 "A Bot kirúgja szines írás miatt, és kitiltja \n"
 "%d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "A Bot kirúgja szines írás miatt a usert."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2607,12 +1919,12 @@ msgstr ""
 "A Bot kirúgja flood miatt (%d sor %d mp alatt),\n"
 "és kitiltja %d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot kirúgja flood miatt a usert. (%d sor %d mp alatt)"
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2621,11 +1933,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2635,7 +1947,7 @@ msgstr ""
 "A Bot kirúgja ismétlés miatt (ha %d alkalommal ismétli\n"
 "ugyanazt a sort), és kitiltja %d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2644,7 +1956,7 @@ msgstr ""
 "A Bot kirúgja ismétlés miatt a usert (ha %d alkalommal\n"
 "ismétli ugyanazt a sort)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2653,11 +1965,11 @@ msgstr ""
 "A Bot kirúgja fordított írás miatt, és kitiltja %d\n"
 "kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "A Bot kirúg fordított írás miatt."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2666,16 +1978,16 @@ msgstr ""
 "A Bot kirúgja aláhúzásos írás miatt, és kitiltja\n"
 "%d kirúgás után a usert."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "A Bot kirúgja aláhúzásos írás miatt a usert."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "A Bot kirúgja szines írás miatt a usert."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2684,182 +1996,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "A Bot most már nem fog kirúgni tiltott szó miatt."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "A Bot nem fog kirúgni félkövér betû használat miatt."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Bot nem fog kirúgni caps lock miatt."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Bot nem fog kirúgni szines írás miatt."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "A Bot nem fog kirúgni flood miatt."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "A Bot nem fog kirúgni ismétlés miatt."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "A Bot nem fog rúgni fordított írás miatt."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot nem fog kirúgni aláhúzásos írás miatt."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Bot nem fog kirúgni caps lock miatt."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ\t : %6d bejegyzés, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Botok melyeket csak IRC operátorok társíthatnak:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Olvasott Byteok : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Írott Byteok : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | #szoba}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS { ADD | DEL |LIST } [ szöveg | szám ]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nicknév "
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES #szoba [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR #szoba mit?"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Visszavonja az utoljára küldött memot"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Törölheted a csatornád regisztrációját"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Nicknév regisztrációjának törlése"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nem lehet most levelet küldeni;  próbáld újra késõbb."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Botok listája:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Access list for %s is empty."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "%s hozzáférési listája:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ\t : %6d bejegyzés, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "%s usermódjai megváltoztatva."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s váltóztatott a módodon."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "%scsatorna nem létezik."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Megváltoztatja a szervízzel való kommunikációt"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "%s usermódjai megváltoztatva."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "%s csatorna regisztrációjának törlése sikerült."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"%scsatornát %s forbidolta:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "A megadott csatorna %s már regisztrált!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "A (%s) szoba letiltva."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "(%s) szoba újra használható."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "(%s) szoba használata felfüggesztve."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr " %s szoba nem regisztrált."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "%scsatornát nem lehet regisztrálni vagy használni."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Ez a csatorna %s nem regisztrálható. "
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Regisztráltam a %s csatornát a (%s) nickre."
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Szoba\t       : %6d bejegyzés, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "A megadott csatorna (%s) el fog évülni."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "A megadott csatorna (%s) nem fog elévülni."
@@ -2869,33 +2206,28 @@ msgstr "A megadott csatorna (%s) nem fog elévülni."
 msgid "Channel %s %s list has been cleared."
 msgstr "Channel %s AOP list has been cleared."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Channel %s access list has been cleared."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Channel %s akick list has been cleared."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "(%s) szoba újra használható."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Szoba SQLINE-ok nem támogatottak ezen az IRCd-n,ezért\n"
 "nem tudod használni."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2903,7 +2235,7 @@ msgstr ""
 "Szoba lista:\n"
 "Név\t\t\tUser Mód   Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2912,7 +2244,7 @@ msgstr ""
 "Azon csatornák, ahol %s nicknek hozzáférése van:\n"
 "  Sorszám  Csatorna              Szint    Meghatározás"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2920,16 +2252,47 @@ msgstr ""
 "Azon csatornák, ahol hozzáférésed van:\n"
 "  Sorszám  Csatorna           Szint    Meghatározás "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Ellenõrzi, hogy a címzett elolvasta-e már az üzit"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Konfigurálja a bot opcióit"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Konfigurálja a kirúgásokat"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Törli a szoba módot"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "%s szobát nem sikerült használhatóvá tenni!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Aktuális AKILL lista:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2937,15 +2300,15 @@ msgstr ""
 "Aktuális AKILL lista:\n"
 "  Szám   Maszk                              Indok"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Jelenlegi Modul lista:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Aktuális SNLINE lista:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2953,11 +2316,11 @@ msgstr ""
 "Aktuális SNLINE lista:\n"
 "  Szám   Maszk                              Indok"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Aktuális SQLINE lista:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2965,11 +2328,11 @@ msgstr ""
 "Aktuális SQLINE lista:\n"
 "  Szám   Mask                              Indok"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Aktuális SZLINE lista:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2978,7 +2341,7 @@ msgstr ""
 "Szám\tMask\t\t\t\t\tIndok"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Aktuális Session korlát kivétel lista:"
 
@@ -3002,56 +2365,61 @@ msgstr "Aktuális SQLINEok száma : %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktuális SZLINEok száma: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Aktuális felhasználók: %d (%d op)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [#szoba] { szám | list | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP #szoba"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Kikapcsolja a társított vhostot"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3176,6 +2544,41 @@ msgstr "Alap SZLINE lejárati idõ: 1 perc"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Alap SZLINE lejárati idõ: Nem elévülõ"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr "    LOGONNEWS   Fellépõ üzenetek beállítása"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr "    LOGONNEWS   Fellépõ üzenetek beállítása"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS    Operek részére megjelenõ üzenetet állít be"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Törli a megadott üzenete(ke)t"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Törli a vhosztot a nickekröl a csoportban"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Törli egy felhasználónak a vhostját"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3186,7 +2589,7 @@ msgstr "%d bejegyzés törölve a %s AOP listáról."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d bejegyzés törölve (%s) csatorna hozzáférési listájáról."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d bejegyzés törölve a (%s) csatorna autokick listájáról."
@@ -3226,7 +2629,7 @@ msgstr "Törölve %d bejegyzés az SZLINE listáról."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 bejegyzés törölve a (%s) csatorna hozzáférési listájáról"
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 bejegyzés törölve a (%s) csatorna autokick listájáról."
@@ -3261,34 +2664,76 @@ msgstr "Törölve 1 bejegyzés az SZLINE listáról."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 bejegyzés törölve a %s AOP listáról."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "%s csatorna leírás megváltoztatva: %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
 #, fuzzy
-msgid "Disabled"
-msgstr "letiltva"
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Kijelzi a szervízt és aktív állapotát"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Kiírja az összes bejegyzést (Számláló: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Kiírja a bejegyzéseket %d-tól %d-ig"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 "Kiírja azokat a hosztokat melyben a %s szó szerepel.\n"
 "(számláló: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Kiírja az üzenetekkel kapcsolatos információkat"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Kiír egy vagy több vhost bejegyzést"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Kiírja az üzenetekkel kapcsolatos információkat"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3317,167 +2762,210 @@ msgstr "Nem használható ez a szó: %s!"
 msgid "Don't use underlines on this channel!"
 msgstr "Nem használj aláhúzásokat ezen a csatornán!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "%sEmail címe nem érvényes."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paraméterek]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Egyezõ emailek %s ehhez: %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "engedélyezve"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "%s lista vége."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Hozzáférési lista vége."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Vége a szoba listának."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Lista vége - %d / %d csatorna megjelenítve."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Lista vége - %d / %d találat megjelenítve."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Vége a felhasználó listának."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Magyar"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
-msgstr "Hiba! Az Ident hoszzú, írj %d karakternél rövidebbet!"
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
+msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
-msgstr "Hiba! A vhost hoszzú, írj %d karakternél rövidebbet!"
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
+msgstr ""
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "%s kivétel (#%d) áthelyezve a %d pozicíóba."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Lejárati idõ megváltozott: %s."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID #szoba indok"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID #szoba [indok]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nicknév indok"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nicknév [indok]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasy"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "Fantasy mód most ON a %s csatornán."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "Fantasy mód most ON a %s csatornán."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s nick most már nics mellõzve."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      A Szervíz adatbázist frissíti, felülírja\n"
+"                lemezre közvetlenül"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Megváltoztatja a felhasználó nicknevét"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Elfelejtetted a jelszavad? Próbáld ezt"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "A megadott csatorna (%s) új foundere: %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Nincs * karakter!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nicknév"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS  nem elérhetõ, amíg az encryption használatban van"
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nicknév [jelszó]"
 
@@ -3485,11 +2973,26 @@ msgstr "GHOST nicknév [jelszó]"
 msgid "GLOBAL message"
 msgstr "GLOBAL üzenet"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "A befagyott kliens killelve."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Operflaget ad a biztos felhasználónak"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Üdvözlés"
 
@@ -3497,78 +3000,156 @@ msgstr "Üdvözlés"
 msgid "Greet message displayed"
 msgstr "NickServ-es köszöntõ üzenet megjelenik."
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr "Üdvözlõ mód most ON a %s szobán."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, fuzzy, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr "Üdvözlõ mód most ON a %s szobán."
+
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       A nicknévhez tartozó információk elrejtése"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       A szoba elrejtése a listából"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosztok legalább %d sessionnel:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY jelszó"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [idõ] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO #szoba"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {#szoba | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE #szoba"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Jelszavas azonosítás"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Ha nem váltasz nevet 20 sec.-en belül, én megváltoztatom."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Ha nem váltasz nevet 1 percen belül, én megváltoztatom."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Mellõzöttek lista törölve."
@@ -3577,12 +3158,13 @@ msgstr "Mellõzöttek lista törölve."
 msgid "Ignore list is empty."
 msgstr "Mellõzöttek lista üres."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Botok listája:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3598,25 +3180,17 @@ msgstr ""
 "\n"
 "Írd be: /msg %s HELP SET opció bõvebb információért."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Információ a betöltött modulokról"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Információk a %s nevû botról:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "%s információi:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Érvénytelen elévülési idõ."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3624,12 +3198,11 @@ msgstr ""
 "Érvénytelen hosztmaszk. Csak érvényes hosztmaszk lehet,\n"
 "a kivétel nem lehet nick vagy usernév."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
-msgstr "Érvénytelen kód, ellenõrizze az e-mailben, majd próbálja újra."
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
+msgstr ""
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3639,7 +3212,7 @@ msgstr ""
 "és nagyobbnak vagy egyenlõnek mint zéró és kissebbnek \n"
 "mint %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Érvénytelen küszöb érték. 1-nél nagyobb egész számnak\n"
@@ -3649,12 +3222,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE szervernév [leírás]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Csatlakozás egy csoporthoz"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK #szoba opció {ON|OFF} [beállítások]"
@@ -3663,262 +3241,445 @@ msgstr "KICK #szoba opció {ON|OFF} [beállítások]"
 msgid "KICK channel user reason"
 msgstr "KICK #szoba user indok"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kirúgja a felhasználót csatornáról"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Killeli a nickedet használó usert"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS #szoba{SET | DIS[ABLE] | LIST | RESET }[ opció [szint]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST pattern"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [#szoba] [list | NEW ]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP célnick jelszó"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS { ADD | DEL | LIST } [szöveg|szám]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Új nyelvezet: Magyar."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "%s részére küldött utolsó memo üzenet visszavonva."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Utolsó kilépõ üzenet: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Utoljára látott cím: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "%s szintjének új értéke a (%s) csatornán: %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "A szintnek kizárólag %d és %d között kell lennie."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Ez a parancs használhatatlan ebben a módban. (xOP)"
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Azon bejegyzések listája, melyek egyeznek ezzel, %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Listázza a betöltött modulokat"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s csoportjába tartozó nickek listája:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "A csoportodba tartozó nickek listája:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Megjeleníti az üzenetek listáját"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Listázza az összes csatornát "
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "A csoportodba tartozó nickek listája:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Listázza az összes felhasználót  "
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Listázza az elérhetõ botokat"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Betölti a modult"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Helyi csatornák nem regisztrálhatók."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Logon news tétel #%d törölve."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Logon news tétel #%d nem található!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Fellépési hírek:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE szoba mód"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO Fájlnév"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD Fájlnév"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD Fájlnév"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD Fájlnév"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Szerkeszti a tiltott szavak listáját"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Karbantartja a hálózat botjainak listáját"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Szerkeszti az AKILL listát"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulálja a DefCon rendszert"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Szerkeszti az SNLINE listát"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Szerkeszti az SQLINE listát"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Szerkeszti az SZLINE listát"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "A maszknak ilyen formátumúnak kell lennie: user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Kiírja az ilyen e-mail címmel regisztrált\n"
+"               felhasználókat"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Legtöbb felhasználó: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Üzenet szám: %d; feladó: %s (%s). Törléshez: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Üzenet szám: %d; feladó.: %s (%s). Törléshez: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "A megadott üzenetet (%d) töröltem."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "%s ezentúl korlátlan számú üzenetet fogadhat."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "%s maximálisan fogadható üzeneteinek száma: %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "%s ezentúl nem fogadhat üzeneteket."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Túl nagy érték a max.bejövÕ üzenetnek,%d az új értéke."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Üzenet elküldve %s részére."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "%s üzenetei. Olvasáshoz írd be: /msg %s READ szám"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "%s üzenetei.  Olvasáshoz : /msg %s READ %s szám"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "%s üzenetei. Olvasáshoz írd be: /msg %s READ szám"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "%s üzenetei.  Olvasáshoz : /msg %s READ %s szám"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Üzenet mód"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "\tRögzített módok: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Módosítja a Szervíz mellõzési listáját"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        AutoOperátor lista beállítása"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        SzuperOperátor lista beállítása"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     A hozzáférési lista módosítása"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     A szoba hozzáférési listájának beállítása"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Módosítja a session-korlát/kivétel listát"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "%s modul betöltve"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "%s modul betöltve"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "%s modul kitöltve"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modul: %s Verzió: %s Szerzõ: %s Betöltve: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modul: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} szerver"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases\t : %6d bejegyzés, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Csoport\t : %6d bejegyzés, %5d kB"
@@ -3931,11 +3692,13 @@ msgstr "Nem lesz kirúgva a bot automatikus funkcióival."
 msgid "New memo"
 msgstr "Új memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Új üzenet %s részére. Olvasáshoz: /msg %s READ szám"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "%s új üzenetei.  Olvasáshoz,: /msg %s READ %s szám"
 
@@ -3943,141 +3706,107 @@ msgstr "%s új üzenetei.  Olvasáshoz,: /msg %s READ %s szám"
 msgid "News list is full!"
 msgstr "A Hírlista tele!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Ezt a nicket: %s %s forbidolta:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "A %s nicknevet dropoltad."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Ez a nicknév: %s már regisztrált!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr " %snick illegális nicknév vagy nem használható."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Ez a nick: %s jelenleg használatban van."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "%s nick most már forbidolt."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "A %s nick a Hálózat Szervízének egysége."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Ezt a nicket %s nem fogja a services."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Ez a nick: %s nincs jelenleg használatban."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Ez a nick: %s nem regisztrált."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr " %snicket  nem lehet regisztrálni vagy használni."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s nick nem található a mellõzöttek listáján."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "A nicked %s meg lett csonkítva %d karakter hosszúságúra."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "%s nickre nem érkezett memo üzenet tõled."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr " %s nick sikeresen kijelentkezett."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is currently suspended."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NEM regisztrált, próbáld késõbb."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "A %s nicknév érvényesítve. "
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "A %s nicknevet dropoltad."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Ez a nicknév: %s már regisztrált!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Ez a nicknév: %s nem regisztrálható."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Ez a nicknév: %s számodra lett regisztrálva: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nicknév Regisztráció (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4088,26 +3817,36 @@ msgstr ""
 "a regisztrációja elévül, a nicknevet bárki regisztrálhatja,\n"
 "és használhatja."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Nincs Bot mód most ONa %s szobán."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Nincs Bot mód most ONa %s szobán."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nincs Email listázva ehhez: %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Nincs bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "nem fog elévülni"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Nincs ezzel kapcsolatban segítség: %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nincs elérhetõ információ a  %s modulról"
@@ -4122,13 +3861,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Nincs ilyen bejegyzés a %s AOP listán."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nincs ilyen bejegyzés a (%s) csatorna hozzáférési listáján."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nincs ilyen bejegyzés a (%s) csatorna autokick listáján."
@@ -4139,39 +3878,43 @@ msgstr "Nincs ilyen bejegyzés a (%s) csatorna autokick listáján."
 msgid "No matching entries on %s bad words list."
 msgstr "Nincs ilyen szó %s a tiltott szavak listáján."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Nincs ilyen bejegyzés a session-korlát kivétel listán."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Nincs ilyen bejegyzés az AKILL listán."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Nincs ilyen bejegyzés az SNLINE listán."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Nincs ilyen bejegyzés az SQLINE listán."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Nincs ilyen bejegyzés az SZLINE listán."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Nincs visszavont memo üzenet."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Jelenleg nincs modul betöltve."
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nincs törölhetõ opernews tétel!"
@@ -4180,16 +3923,12 @@ msgstr "Nincs törölhetõ opernews tétel!"
 msgid "No random news items to delete!"
 msgstr "Nincs törölhetõ random news tétel!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Nincs indok"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Nincs signkick, ha a SIGNKICK LEVEL használatban van."
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Nincs"
 
@@ -4197,7 +3936,7 @@ msgstr "Nincs"
 msgid "Not allowed to join channel"
 msgstr "Nem léphet a csatornára, ha a RESTRICTED használatban."
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4208,28 +3947,28 @@ msgstr ""
 "napig, automatikusan elvesztik regisztrációjukat.\n"
 "Automatikusan dropolásra kerülnek."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Szám  Korlát  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flagek"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Opok értesítése"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS { ADD | DEL |LIST } [ szöveg | szám ]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4238,13 +3977,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "A régi info megegyezik az újjal."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Szint Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice option for %s is now ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice option for %s is now ON."
 
 #: modules/core/os_news.cpp:55
@@ -4253,131 +3997,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Oper news tétel #%d törölve."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Oper news tétel #%d nem található!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper hírek listája:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ\t : %6d bejegyzés, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "%s operflagek megadva a %s nicknek."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Opok védelme"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Ez az opció: %snem állítható be ezen a hálózaton."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Kód a %s nickhez:  %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Jelszavad elfogadva - azonosítás sikeres."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Jelszavas azonositás szükséges ehhez a parancshoz.\n"
-"Próbáld újra miután beírtad: /msg %s IDENTIFY jelszó."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Hibás jelszó."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "%s jelszava: %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Hibás jelszó."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "%s nick jelszava elküldve."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Békesség"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace option for %s is now ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Keress meg egy Operátort és kérj tõle vhostot."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Próbálj nehezebb jelszót használni .Jelszavad  min. öt\n"
-"karakter legyen,\tés nem kitalálható legyen, (ne a\n"
-"nickneved/valósneved),  ne legyen benne írásjel."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Kérlek használj érvényes szerver nevet amikor jupolsz!"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Please use the symbol of # when attempting to register"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Kérlek várj %d másodpercet és próbáld újra."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Kérlek várj %d másodpercet, mielõtt ismét használod a GROUP parancsot."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr " Várj %d másodpercet mielõtt  használnád ezt a parancsot!"
@@ -4392,63 +4100,122 @@ msgstr "Kérlek várj %d másodpercet mielõtt újra használod az RSEND parancsot."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Kérlek, várj %d másodpercet mielõtt SEND parancsot újra használod!"
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Megakadályozza a szoba használatát"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Felfüggeszti a szoba használatát de\n"
+"               megõrzi az adatokat és beállításokat."
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Megelõzi, hogy a nicknév regisztrált legyen"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privát"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "Private mód a %s botban most ON."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "Private mód a %s botban most ON."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now off."
 msgstr "Private option for %s is now ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option for %s is now on."
+msgstr "Private option for %s is now ON."
+
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Kill védelem"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
+#, fuzzy, c-format
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Modul parancsai: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS { ADD | DEL | LIST } [ szöveg | szám ]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [#szoba] {list | LAST | NEW }"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nicknév [jelszó]"
 
@@ -4456,15 +4223,15 @@ msgstr "RECOVER nicknév [jelszó]"
 msgid "REGISTER channel description"
 msgstr "REGISTER #szoba leírás"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nicknév [jelszó]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | #szoba} memo-szöveg"
 
@@ -4474,290 +4241,366 @@ msgid "Random news item #%d deleted."
 msgstr "Random news tétel #%d törölve."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Random news tétel #%d nem található!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Véletlenszerû hírek listája:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Elolvassa a megadott üzenete(ke)t"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Átállíthatod a szoba hozzáférési szintjeit"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE    Visszaadja a neved a RECOVER után"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Nicknév regisztráció"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Nicknév regisztráció"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Szabályozza a kritikus parancsok használatát"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Törli a suspendet a csatornáról."
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Betölti a modult"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
 msgstr ""
-"Regisztráció 1 lépése lehet, hogy elévült, írd be: \"/msg %s register "
-"<jelszó> <email>\"."
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Restrict access to the channel"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Korlátozott hozzáférés"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Restricted access option for %s is now ON."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Restricted access option for %s is now ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     Topic megtartása ha a szoba nincs használatban"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Kiirja a jeszavát a nicknévnek\n"
+"               (encryption esetén nem használható)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Kiírja a felhasználó aktuális hozzáférési\n"
+"               szintjét a megadott csatornán"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY #szoba szöveg"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | #szoba} memo-szöveg"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nicknév"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS nem elérhetõ, amíg az encryption használatban van."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST korlát"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hosztmaszk>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET #szoba opció beállítások"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET botname NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET botnév PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET #szoba opció paraméterek"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET #szoba DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET #szoba DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET #szoba FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET szoba GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET #szoba KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET #szoba OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET #szoba NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET #szoba OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET #szoba PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET #szoba PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET #szoba RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET #szoba SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET #szoba SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET #szoba SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET #szoba SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET szoba SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET #szoba TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET #szoba XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opció paraméterek"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET opció beállítás"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE szám"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [#szoba] limit"
 
@@ -4765,7 +4608,7 @@ msgstr "SET LIMIT [#szoba] limit"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [user | #szoba] {limit | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
@@ -4773,24 +4616,24 @@ msgstr "SET MSG {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hosztmaszk>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "SNLINE lista üres."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4798,16 +4641,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[ +lejárat] {maszk| sorszám }[:"
 "Indok]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP #szoba { ADD | DEL | LIST | CLEAR }[ nick | sorszám]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "SQLINE lista üres."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4815,54 +4658,64 @@ msgid ""
 msgstr ""
 "SQLINE {ADD|DEL|LIST|VIEW|CLEAR}[ [ +lejárat ] { maszk | sorszám }[ indok ]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Jelszavad elfogadva - azonosítás sikeres."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Jelszavad elfogadva - azonosítás sikeres."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND #szoba indok"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND #szoba indok"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick újnick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "SZLINE lista üres."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4871,64 +4724,118 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR }[[ +lejárat ] { maszk | sorszám } "
 "[ indok ]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Menti az adatbázist, és újraindítja a szervízt"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Secure"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Founderjog védelme"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Opjog védelme"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now off."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure founder option for %s is now on."
+msgstr "Secure founder option for %s is now ON."
+
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
 msgstr "Secure ops option for %s is now ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now on."
+msgstr "Secure ops option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Secure option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_set_secure.cpp:36
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Biztonság"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Üzenetet küld egy nicknek vagy csatornára"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF Memo küldése minden opernek/adminnak."
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL Memo küldése minden regisztrált felhasználónak."
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Üzenetet küld összes felhasználónak"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr "    OPNOTICE      Üzenetet küld az OP/VOICE parancsok használtáról"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Memo üzenetet küld és olvasási visszaigazolást kér"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Szervíz Defcon módban fut, próbáld késõbb."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Szervíz új DEFCON szintje %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Szervíz elévülõ módban van."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Szervíz nem elévülõ módban van."
 
@@ -4940,7 +4847,7 @@ msgstr "Szervíz most  csak olvas módban."
 msgid "Services are now in read-write mode."
 msgstr "Szervíz most olvas ír módban."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Szervíz most debug módban (szint: %d)."
@@ -4953,7 +4860,7 @@ msgstr "Szervíz most debug módban fut."
 msgid "Services are now in non-debug mode."
 msgstr "Szervíz most már nem fut debug módban."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "A Szervíz úgy van beállítva, hogy nem küld mailt."
 
@@ -4963,7 +4870,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -4972,152 +4879,189 @@ msgstr ""
 "Szervíz nem tudja változtatni a módokat.\n"
 "A szerverek U:lines beállitása helyes?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Szervíz fent van %d nap, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Szervíz fent van %d óra, %d perce"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Szervíz fent van %d perc, %d másodperce."
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Szervíz konfigurációs fájl újratöltve."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "A Services rendelkezésedre bocsájtotta a nicket."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Session korlát %s részére %d-re állítva."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Session korlátozás tiltva."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Session\t : %6d bejegyzés, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessions  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
 #, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Beállíthatod a csatornád opcióit"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       A banolás tipusának beállítása"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Üzenetekkel kapcsolatos beállításokat hajt végre"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Opciók beállítása, például kill védelem"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          A szobameghatározás állítás"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Set the display of your group in Services"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       A founder megváltoztatása"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr "    LANGUAGE   A szervíz nyelvezetének megválasztása"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     A successor megadása"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Beállítja a vhosztot összes nicknek a csoportban"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Beállít egy vhosztot a felhasználónak"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Beállítja szervíz általános változóit"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Set your nickname password"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "%s beállítás nem ismert. Írd be /msg %s HELP LEVELS DESC\n"
 "az érvényes beállítások listájának megtekintéséhez.  "
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "A DEBUG beállításhoz kell ON,/OFF,/ pozitív szám."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Az NOEXPIRE beállításhoz kell ON vagy OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "READONLY beállitáshoz kell lenni ON vagy OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 "SET SuperAdmin  ON vagy OFF \n"
 "(engedélyezni kell a services.conf-ban)"
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signed kick option for %s is now ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Mutatja a Szervít és hálózat állapotát"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Sign kickek, melyek a KICK paranccsal történnek"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5126,27 +5070,33 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Signed kicks"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sajnálom, az RSEND használata le van tiltva ezen a hálózaton."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Bot társítás ideiglenesen nem mûködik."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "A bot létrehozása sikertelen."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "A bot módosítás ideiglenesen szünetel."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot beállítás idõlegesen szünetel."
 
@@ -5156,7 +5106,7 @@ msgstr "Bot beállítás idõlegesen szünetel."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Csatorna AOP lista módosítás szünetel."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "A csatorna hozzáférési listájának módosítása szünetel."
 
@@ -5164,63 +5114,42 @@ msgstr "A csatorna hozzáférési listájának módosítása szünetel."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Csatorna autokick listájának módosítása szünetel."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Csatornán tiltott szaval listájának változtatása letiltva."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "A csatornák regisztrációjának törlése jelenleg szünetel."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "A csatornák opcióinak beállitása jelenleg szünetel."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Sajnálom,  a csatorna regisztráció jelenleg szünetel."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Sajnálom, azonosítás sikertelen."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Kirúgás használata ideiglenesen letiltva."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Üzenet opcióinak beállítása szünetel."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Sajnálom, az üzenetküldés szünetel."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Sajnálom,  a nicknevek regisztrációjának törlése  szünetel."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Sajnálom, a csoportok használata ideiglenesen le van tiltva."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Sajnálom,  a nicknév opció beállítás jelenleg szünetel."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Sajnálom, a nickregisztráció jelenleg nem mûködik."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Sajnálom, a regisztráció sikertelen."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5231,12 +5160,12 @@ msgstr "Neked csak %d  helyed van a csatorna listáján."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Neked csak %d bejegyzésed lehet a hozzáférési listán."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Neked csak %d  helyed van a csatorna listáján."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "%d bejegyzésnél nem lehet több a listán."
@@ -5246,21 +5175,16 @@ msgstr "%d bejegyzésnél nem lehet több a listán."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Csak %d tiltott szó lehet a csatornán."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Már túllépted a felsõ korlátot (%d) a csatornán."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Már elérted a felsõ korlátot (%d) csatornák számában."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Neked csak %d bejegyzésed lehet a hozzáférési listán."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statisztika nullázva."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Státusz frissítve (memok, vhost, chmodok, flagek)."
 
@@ -5272,12 +5196,22 @@ msgstr "Ne floodolj!"
 msgid "Stop repeating yourself!"
 msgstr "Ne ismételd magad!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER Csatornán a founder státusz szigorú kezelése"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     A csatornán az op státusz szigorú kezelése"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "A megadott csatorna %s successora törölve."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "A megadott csatorna (%s) új successora: %s."
@@ -5286,21 +5220,36 @@ msgstr "A megadott csatorna (%s) új successora: %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Együttélés"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Együttélés mód most ONa %s szobán."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Együttélés mód most ONa %s szobán."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       A vhostot a csoport minden tagjára állítja"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Szintaktika: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5327,7 +5276,7 @@ msgstr ""
 "2: *!*@host formátumú tiltás\n"
 "3: *!*user@*.domain formátumú tiltás"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5340,7 +5289,7 @@ msgstr ""
 "Beállítható a szoba általános meghatározása, ami látszódni\n"
 "fog a  LIST és INFO parancs használata esetén."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5353,7 +5302,7 @@ msgstr ""
 "Megváltoztatja a szoba founderjét.\n"
 "Az új nicknév regisztrált kell hogy legyen!"
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5371,7 +5320,7 @@ msgstr ""
 "a topicot a %s megjegyzi miután az utolsó user elhagyja a\n"
 "szobát, és visszaállítja a következõ megnyitáskor."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5389,7 +5338,7 @@ msgstr ""
 "az OP, VOICE, vagy a hozzájuk kapcsolódó parancsokat a\n"
 "szoban."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5406,7 +5355,7 @@ msgstr ""
 "rúghatnak ki, tilthatnak ki olyan usert akinek az övékkel\n"
 "egyenlõ vagy magasabb szintje van a %s parancsokhoz."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5451,7 +5400,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5466,7 +5416,7 @@ msgstr ""
 "parancs által kilistázott csatornák között nem szerepel \n"
 "a szoba."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5481,7 +5431,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5500,7 +5450,7 @@ msgstr ""
 "jelszavukkal (használván az IDENTIFY parancsot) kaphatnak\n"
 "a szobában jogokat, ha szerepelnek a hozzáférési listán."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5519,7 +5469,7 @@ msgstr ""
 "szoba jelszavát, founderét, jogutódját, de azok nem,\n"
 "akik csak az IDENTIFY parancsot használták a %s-ben."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5542,7 +5492,24 @@ msgstr ""
 "is ez történik, ha nem volt megadva successor.\n"
 "A nicknek regisztrálnak kell lennie."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Syntax: %s #szoba TOPICLOCK {ON | OFF}\n"
+"\n"
+"Engedélyezi vagy letiltja a topic lezárása opciót a \n"
+"csatornán. Ha a topic lezárása be van kapcsolva,a %s nem\n"
+"engedélyezi a csatornán a topic változtatását a TOPIC\n"
+"paranccsal."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5576,8 +5543,8 @@ msgstr ""
 "Az xOP lista rendszerrõl az access lista rendszerre való \n"
 "áttérés nem okoz gondot."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5662,7 +5629,7 @@ msgstr ""
 "Az ACCESS CLEAR parancs töröl minden bejegyzés a szoba\n"
 "hozzáférési listájáról."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5711,7 +5678,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "          Megmutatja a hozzáférési listát."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5723,7 +5690,7 @@ msgstr ""
 "A bot \"/me\" akcióval küldi el a megadott szöveget\n"
 "a csatornára."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5743,7 +5710,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5767,7 +5734,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5823,7 +5790,7 @@ msgstr ""
 "AKICK CLEAR paranccsal az összes akick lista bejegyzés \n"
 "törölhetõ."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5910,7 +5877,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5949,7 +5916,7 @@ msgstr ""
 "Azok a csatornák melyeken a NOEXPIREopció be van állítva,\n"
 "prefixel lesznek megjelölve a listában."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -5969,7 +5936,7 @@ msgstr ""
 "\n"
 "Ennek a használata korlátozva Szervíz adminra."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -5999,17 +5966,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: AOP #szoba ADD nick\n"
 "        AOP #szoba  DEL {nick  |  sorszám  |  lista }\n"
@@ -6055,7 +6011,7 @@ msgstr ""
 "írd be: /msg %s HELP SET XOP hogy megnézd, hogyan tudsz \n"
 "váltani az xOP rendszerrol az access lista rendszerre."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6069,8 +6025,8 @@ msgstr ""
 "botodat a csatornád igényeidnek megfelelõen.\n"
 "Kellemes botozást! :-)"
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6091,20 +6047,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Syntax:BADWORDS #szoba ADD  szó  [SINGLE  |  START  |  END]\n"
 "\t BADWORDS #szoba DEL { szó  |  sorszám  |  list}\n"
@@ -6139,7 +6081,7 @@ msgstr ""
 "BADWORDS CLEAR parancs törli az összes bejegyzést\n"
 "a tiltott szavak listájáról"
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6155,7 +6097,7 @@ msgstr ""
 "Alapbeállítás szerint, minimum AOP vagy 5-ös access \n"
 "szinttel kell rendelkezned a csatornán, hogy használhasd."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6197,7 +6139,7 @@ msgstr ""
 "nickkel, akkor a nick dropolva lesz. Akkor is, ha a user\n"
 "éppen használja a nicket; killelve lesz."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6207,7 +6149,7 @@ msgstr ""
 "\n"
 "Listázza az összes érvényes botot a hálózatról."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6219,7 +6161,21 @@ msgstr ""
 "Visszavonja az utolsó memo üzenetet, amit a nicknek\n"
 "vagy csatornának küldtél."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6231,7 +6187,7 @@ msgstr ""
 "és teljesen valós ident@host maszkot használja, minden \n"
 "nick esetében végrehajtja az AKILLt."
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6255,7 +6211,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6268,7 +6224,7 @@ msgstr ""
 "küldtél már olvasott-e vagy még olvasatlan.\n"
 "Megjegyzés, ez csak nickekkel mûködik szobákkal nem."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6283,7 +6239,7 @@ msgstr ""
 "\n"
 "Csak founder szintu user használhatja."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6293,16 +6249,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6319,7 +6288,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6331,7 +6300,7 @@ msgstr ""
 "korlátozást a szervíz használatban egy támadás alkalmával\n"
 "a hálózaton."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6354,7 +6323,7 @@ msgstr ""
 "a HOP listán vagy 4-es access szinten szereplõ userek\n"
 "használhatják, hogy saját maguktól elvegyék a félopot"
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6364,7 +6333,7 @@ msgstr ""
 "A vhost törölve az adott nick adatbázisából.\n"
 "Korlátozva Hoszt változtatókra."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6401,7 +6370,7 @@ msgstr ""
 "\tDEL 2-5,7-9\n"
 "\t\tTörli a memo üzeneteket 2 és 5, illetve 7 és 9 között."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6414,7 +6383,7 @@ msgstr ""
 "\n"
 "Korlátozva Hoszt változtatókra."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6434,7 +6403,7 @@ msgstr ""
 "Alap beállítás szerint csak a minimum AOP listán\n"
 "vagy 5-ös access szinten szereplo userek használhatják."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6453,7 +6422,7 @@ msgstr ""
 "Alap beállítás szerint csak a minimum AOP listán\n"
 "vagy 5-ös access szinten szereplo userek használhatják."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6473,7 +6442,7 @@ msgstr ""
 "vagy min. az SOP listán vagy 10-es access szinten\n"
 "szereplõ userek használhatják maguk deprotectolására."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6496,7 +6465,7 @@ msgstr ""
 "a VOP listán vagy 3-as access szinten szereplo userek\n"
 "használhatják saját maguktól elvenni voiceot."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6508,7 +6477,7 @@ msgstr ""
 "Törli a megnevezett szoba regisztrációját.\n"
 "Csak a szoba founder használhatja."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6521,8 +6490,8 @@ msgstr ""
 "droppolhat csatornát,úgy hogy nem használja a szoba\n"
 "jelszavát."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6552,7 +6521,7 @@ msgstr ""
 "mint a nick tulajdonosa, használva az IDENTIFY parancsot,\n"
 "írd be: /msg %s HELP IDENTIFY bõvebb információért. "
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6575,7 +6544,7 @@ msgstr ""
 "\n"
 "Használat korlátozva Szervíz adminoknak."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6660,7 +6629,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6678,7 +6647,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6696,7 +6665,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminra."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6711,7 +6680,7 @@ msgstr ""
 "lekért email cím és az azt lekérõ személy naplózva lesz.\n"
 "Korlátozva Szervíz adminra."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6721,7 +6690,7 @@ msgstr ""
 "\n"
 "Megadja a szoba kulcsot."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6742,7 +6711,7 @@ msgstr ""
 "\n"
 "A parancs nem elérhetõ, ha az encryption használatban van."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6765,7 +6734,7 @@ msgstr ""
 "befagy például lefagy a géped vagy a kapcsolatod.\n"
 "A beragadt nicked killelheted, ha ismered a jelszót ."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6775,7 +6744,7 @@ msgstr ""
 "\n"
 "Listáz minden nicket a csoportodból."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6808,7 +6777,7 @@ msgstr ""
 "Megengedi, hogy az IRCopok üzenetet küldjenek az összes \n"
 "felhasználónak a hálózaton. Üzenetet a %s nickrõl küldi."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6821,7 +6790,8 @@ msgstr ""
 "Ez a parancs lehetõvé teszi, hogy a JELENLEGI nick\n"
 "vhostját beállítsuk a csoport minden nickjére."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6884,7 +6854,7 @@ msgstr ""
 "Megjegyzés: minden nicknévnek a csoportban ugyanaz\n"
 "\t\t a jelszava."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6906,7 +6876,7 @@ msgstr ""
 "a HOP listán vagy 4-es access szinten szereplõ userek\n"
 "használhatják saját maguknak félop adására."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -6935,16 +6905,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: HOP  #szoba ADD nick\n"
 "        HOP #szoba DEL { nick  |  sorszám  |  lista}\n"
@@ -6988,7 +6948,7 @@ msgstr ""
 "és írd be: /msg %s HELP SET XOP hogy megnézd, hogyan \n"
 "tudsz váltani az xOP rendszerrõl access lista rendszerre."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7005,7 +6965,7 @@ msgstr ""
 "nicknek. Jelszónak ugyanannak kell lennie amit a \n"
 "regisztrációnál megadtál, vagy amire módosítottad."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7015,7 +6975,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7049,7 +7009,7 @@ msgstr ""
 "Ignores will not be enforced on IRC Operators.\n"
 "\t"
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7070,7 +7030,7 @@ msgstr ""
 "\n"
 "Alapból az ALL opció csak a foundernek engedélyezett."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7086,7 +7046,7 @@ msgstr ""
 "informaciót megkaphatsz az ALL paraméter használatával \n"
 "és  így látni fogod a rejtett információkat is."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7103,7 +7063,7 @@ msgstr ""
 "érkezésekor. Paraméter megadása esetén az információt\n"
 "csatornára vonatkozóan jeleníti meg."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7129,7 +7089,7 @@ msgstr ""
 "meg ezeket az információkat.Enek használat korlátozva \n"
 "Szervíz adminra."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7149,7 +7109,7 @@ msgstr ""
 "kapsz információkat, például létrehozás ideje, csatornák\n"
 "száma."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7193,7 +7153,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7209,7 +7169,8 @@ msgstr ""
 "Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel\n"
 "kell rendelkezned a csatornán, hogy használhasd."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7236,7 +7197,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7258,8 +7219,8 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7327,7 +7288,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7345,7 +7306,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7363,7 +7324,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7392,7 +7353,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7410,7 +7371,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7433,7 +7394,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7449,7 +7410,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7467,7 +7428,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot.\t"
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7485,7 +7446,7 @@ msgstr ""
 "Ha nem adod meg, akkor csak kirúgást eszközöl a bot.\n"
 "Ha megadod a ttb-t, akkor x kirúgás után banol a bot."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7538,7 +7499,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7564,7 +7525,7 @@ msgstr ""
 "amikor megjeleníti a tartalmat az operátornak.\n"
 "Korlátozva Szervíz operátorokra."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7579,7 +7540,7 @@ msgstr ""
 "(Ahol a PRIVATE opció be van kapcsolva nem fog\n"
 " megjelenni a listában.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7620,7 +7581,7 @@ msgstr ""
 "          Listáz minden nicket, amit utoljára olyan user használt,\n"
 "          akinek a bar.org volt a domain-je."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7677,7 +7638,7 @@ msgstr ""
 "            Listázza az összes felhasználót, akinek a beállítása\n"
 "            nem elévülõ."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7700,11 +7661,21 @@ msgstr ""
 "\tLIST 2-5,7-9\n"
 "\t\tListázza az üzeneteket 2 és 5, illetve 7 és 9 között."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Syntax: LOGONNEWS ADD szöveg"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7737,7 +7708,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Syntax: LOGONNEWS DEL {szám | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7751,7 +7722,7 @@ msgstr ""
 "Ezzel az IDENTIFY parancs hatásának fordítottját éred el.\n"
 "Nem fog a NickServ egy adott nick tulajdonosának tekinteni."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7776,24 +7747,7 @@ msgstr ""
 "\n"
 "Használat korlátozva Szervíz adminoknak."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: MODE #szoba módok\n"
-"\n"
-"Megengedi a szervíz operátornak, hogy szoba módokat \n"
-"állítson. Parameterek ugyanazok mint a szabvány\n"
-"/MODE parancsnál\n"
-"\t\n"
-"Korlátozva Szervíz operatornak."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7820,7 +7774,24 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Syntax: MODE #szoba módok\n"
+"\n"
+"Megengedi a szervíz operátornak, hogy szoba módokat \n"
+"állítson. Parameterek ugyanazok mint a szabvány\n"
+"/MODE parancsnál\n"
+"\t\n"
+"Korlátozva Szervíz operatornak."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7830,7 +7801,7 @@ msgstr ""
 "\n"
 "A parancs részletes információt ad a betöltött modulokról."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7841,7 +7812,7 @@ msgstr ""
 "Listázza az összes betöltött aktív modult.\n"
 "\t"
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7853,7 +7824,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7865,7 +7836,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7877,7 +7848,7 @@ msgstr ""
 "Ez a parancs kitölti a megnevezett fájlnevû msdult a \n"
 "modulok listájából."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7908,7 +7879,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7920,7 +7891,7 @@ msgstr ""
 "Ha valaki használ /whois parancsot a nickeden, akkor a\n"
 "valós IP címed vagy hosztod fogja látni."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -7934,7 +7905,7 @@ msgstr ""
 "operflaget adjon. Elõjelként \"+\" vagy \"-\" adható meg.\n"
 "Ha csak a \"-\" paraméter adod meg akkor mindent eltávolít."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -7947,7 +7918,7 @@ msgstr ""
 "akkor a vhostodat fogja látni a valódi IP címed vagy\n"
 "hosztneved helyett."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -7971,7 +7942,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Syntax: OPERNEWS ADD szöveg"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8004,7 +7975,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Syntax: OPERNEWS DEL {szám | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8023,7 +7994,7 @@ msgstr ""
 "Alap beállítás szerint csak a minimum AOP listán\n"
 "vagy 5-ös accessen szereplo userek használhatják."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8044,7 +8015,7 @@ msgstr ""
 "vagy minimum a SOP listán vagy 10-es access szinten\n"
 "szereplõ userek használhatják saját maguk protectolására."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8073,16 +8044,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8121,7 +8082,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8145,7 +8106,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Syntax: RANDOMNEWS ADD szöveg"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8171,7 +8132,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Syntax: RANDOMNEWS DEL {szám | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8197,7 +8158,8 @@ msgstr ""
 "\tREAD 2-5,7-9\n"
 "\t\tMegjeleníti 2 és 5, a 7 és 9 között a memo üzeneteket"
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8245,8 +8207,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8288,8 +8250,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8352,7 +8314,7 @@ msgstr ""
 "megoszthasd a hozzáféréseidet és beállításaidat a nickjeid\n"
 "között. Bõvebb információkért írd be: /msg %s HELP GROUP"
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8381,7 +8343,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8398,7 +8360,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8410,7 +8372,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8435,7 +8397,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak.\t"
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8457,7 +8419,7 @@ msgstr ""
 "Amint a címzett elolvasta a memot, egy automatikus értesítést\n"
 "fog kapni a feladó arról, hogy az üzenetét elolvasták."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8468,7 +8430,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8483,7 +8445,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8495,7 +8457,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8505,7 +8467,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8521,7 +8483,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8544,7 +8506,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8577,24 +8539,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8608,7 +8553,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8620,7 +8565,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8631,7 +8576,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8650,7 +8595,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8673,7 +8618,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8683,7 +8628,7 @@ msgstr ""
 "\n"
 "Elküldi a bot a megadott szöveget a csatornára."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8701,7 +8646,7 @@ msgstr ""
 "A címzett csatornának vagy nicknévnek regisztráltnak kell\n"
 "lennie."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8712,7 +8657,7 @@ msgstr ""
 "\n"
 "Memo üzenet küldése minden regisztrált felhasználónak."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8732,7 +8677,7 @@ msgstr ""
 "\n"
 "Korlátozni lehet IRC operátorokra egyes hálózatokon."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8768,7 +8713,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8785,7 +8730,7 @@ msgstr ""
 "\n"
 "Korlátozva Hoszt változtatókra."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8801,8 +8746,8 @@ msgstr ""
 "nem szerepelnek a hozzáférési listán nem kaphatnak szoba\n"
 "operátori státuszt."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8826,26 +8771,9 @@ msgstr ""
 "a neve nem fog szerepelni a kick indokjában.\n"
 "Lásd még: /msg %s HELP LEVELS bõvebb információkért. "
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Syntax: %s #szoba TOPICLOCK {ON | OFF}\n"
-"\n"
-"Engedélyezi vagy letiltja a topic lezárása opciót a \n"
-"csatornán. Ha a topic lezárása be van kapcsolva,a %s nem\n"
-"engedélyezi a csatornán a topic változtatását a TOPIC\n"
-"paranccsal."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8879,7 +8807,7 @@ msgstr ""
 "Megjegyzés: ezekhez a parancsokhoz a hozzáférést a\n"
 "levels-ben lehet állítani."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8892,7 +8820,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8908,7 +8836,7 @@ msgstr ""
 "\n"
 "Elérhetõ opciók:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8923,7 +8851,7 @@ msgstr ""
 "kirúgni, akkor se, ha nem egyeznek meg a NOKICK szinttel\n"
 "\t"
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -8937,7 +8865,7 @@ msgstr ""
 "Ha engedélyezve van, akkor a hangadókat nem fogja a bot\n"
 "kirúgni, akkor se, ha nem egyeznek meg a NOKICK szinttel"
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -8969,7 +8897,7 @@ msgstr ""
 "szükséges. (például, az !op használatához, meg kell\n"
 "legyen a megfelelõ szintjük az OPDEOP parancsokhoz.)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -8984,7 +8912,7 @@ msgstr ""
 "Ha engedélyezve van, akkor a bot megjeleníti azoknak\n"
 "a köszöntõ üzenetét, akiknek a szintjük megfelelõ ehhez."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -8999,7 +8927,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9015,7 +8943,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9029,7 +8957,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9046,8 +8974,8 @@ msgstr ""
 "amit egyébként a %s csinálna a csatornán, mint MODE,\n"
 "KICK, és a belépõüzenet kiírása."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9072,7 +9000,7 @@ msgstr ""
 "\n"
 "További információért írd be: /msg %s HELP SET opció"
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9082,7 +9010,7 @@ msgstr ""
 "\n"
 "Beállítható nicknév opciók. Az opció ezek egyike lehet:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9108,7 +9036,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9120,7 +9048,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9133,7 +9061,7 @@ msgstr ""
 "szervízben.\tAz új megjelenítésnek a csoport egyik\n"
 "nickjének KELL lennie."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9147,7 +9075,7 @@ msgstr ""
 "Ez az E-mail cím szerepelni fog az INFO-id között,\n"
 "amit bárki lekérhet az INFO paranccsal."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9164,7 +9092,7 @@ msgstr ""
 "megfelelõ szinttel, ami az üzenet megjelenitéséhez\n"
 "szükséges a csatornán."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9187,7 +9115,7 @@ msgstr ""
 "az opció ki legyen kapcsolva(OFF)\tvagy el legyen rejtve\n"
 "az információ(ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9220,7 +9148,7 @@ msgstr ""
 "kérlek ne használd ezt az opciót csak ha nagyon indokolt.\n"
 "A network adminisztrátorok letilthatják ezt."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9235,7 +9163,7 @@ msgstr ""
 "írja.(Például: amikor válaszol egy parancsra, amit te \n"
 "adtál ki). A sorszám alapján válaszd ki a nyelvezetet:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9252,7 +9180,7 @@ msgstr ""
 "küldhet üzenetet a nickedre/csatornára. Mindamellett,\n"
 "nem állíthatod ezt a számot többre, mint %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9294,7 +9222,7 @@ msgstr ""
 "korlátot de nem törölhetik, és nem állíthatnak %d érték \n"
 "felett valamint HARD korlátot."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9303,7 +9231,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9318,7 +9246,7 @@ msgstr ""
 "Az MSG beállítással, a szervíz, privát üzeneteket fog\n"
 "használni, egyébként pedig noticeokat."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9337,7 +9265,7 @@ msgstr ""
 "Ez az opció megegyezik a parancs-sorban kiadható opcióval:\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9373,7 +9301,7 @@ msgstr ""
 "\n"
 "Az ON ekvivalens a LOGON és a NEW kombinálásával."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9384,7 +9312,7 @@ msgstr ""
 "\n"
 "Megváltoztatja a nicknév tulajdonosának jelszavát."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9404,7 +9332,7 @@ msgstr ""
 "(Máskülönben, bárki kaphat információt a nicknevedrõl\n"
 "használva az INFO parancsot.)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9434,7 +9362,7 @@ msgstr ""
 "Ez a parancs egyenértéku a parancs-sorban kiadott\n"
 "-readonly opcióval.\t"
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9457,7 +9385,7 @@ msgstr ""
 "nem fog automatikusan nevet váltóztatni a %s, hacsak\n"
 "nincs bekapcsolva a KILL opció."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9473,7 +9401,7 @@ msgstr ""
 "Ez az opció nem ajánlott, csak akkor használd, ha \n"
 "szükséges és kapcsold ki, ha már nem."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9493,7 +9421,7 @@ msgstr ""
 "a nickeket a csoportban a parancs után jegyezték\t\n"
 "Korlátozva Hoszt változtatókra."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9505,7 +9433,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9593,7 +9521,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9623,16 +9551,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: SOP #szoba ADD nick\n"
 "        SOP #szoba DEL { nick  |  sorszám  |  lista }\n"
@@ -9676,7 +9594,7 @@ msgstr ""
 "és írd be: /msg %s HELP SET XOP hogy megnézd, hogyan \n"
 "tudsz váltani az xOP rendszerrõl access lista rendszerre."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9766,7 +9684,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9776,7 +9694,7 @@ msgstr ""
 "Kijelzi az összes szervíz résztvevõ nickjét, szintjét és \n"
 "on-line helyzetét."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9787,7 +9705,7 @@ msgstr ""
 "\n"
 "Memo üzenet küldése az opereknek/adminoknak."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9829,7 +9747,7 @@ msgstr ""
 "A RESET beállítás nullázza az aktuális felhasználók max.\n"
 "számát átírja a jelenlegi felhasználó számra\t"
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9855,7 +9773,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9901,7 +9819,7 @@ msgstr ""
 "figyelmen kívül hagyja. If no nickname is given, your status\n"
 "will be returned."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9920,7 +9838,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -9930,7 +9848,7 @@ msgstr ""
 "\n"
 "Erõszakkal meváltóztatja a user nickevét újnicknévre."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10014,7 +9932,8 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10038,21 +9957,7 @@ msgstr ""
 "Alapból a szoba founder szintû userei használhatják\n"
 "csak a csatornán. "
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: UMODE user módok\n"
-"\n"
-"Megengedi a szervíz adminoknak, hogy egy user felhasználói\n"
-"módjait megváltoztassa. Parameterek ugyanazok mint a\n"
-"szabvány /MODE parancsnál."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10070,7 +9975,7 @@ msgstr ""
 "Azaz nem kell újra bekonfigurálnod, ha késõbb vissza\n"
 "akarod hozni a szobádba."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10089,7 +9994,7 @@ msgstr ""
 "Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel\n"
 "kell rendelkezned, hogy használhasd.\t"
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10106,7 +10011,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10120,7 +10025,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminnak."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10134,7 +10039,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10159,7 +10064,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10182,7 +10087,7 @@ msgstr ""
 "a VOP listán vagy 3-as access szinten szereplo userek\n"
 "használhatják saját maguk voiceolására."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10211,16 +10116,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: VOP #szoba ADD nick\n"
 "        VOP #szoba DEL {nick | sorszám| lista}\n"
@@ -10262,7 +10157,7 @@ msgstr ""
 "be: /msg %s HELP SET XOP hogy megnézd, hogyan tudsz \n"
 "váltani az xOP rendszerrol az access lista rendszerre."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10278,7 +10173,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10286,7 +10181,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10294,7 +10189,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10307,51 +10202,96 @@ msgstr ""
 "módokat, (ModeonID)és frissíti a vhostod, az userflagjeid\n"
 "(utolsó fellépés, stb.)"
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC #szoba [topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Ideiglenesen törli az összes O:line-t a szerver\n"
+"                távollétében"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Leállítja a szervíz programot mentéssel"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Leállítja a szervíz programot mentés nélkül"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "Az  IMMED opció nem elérhetõ ezen a hálózaton."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Az AKILL lista törölve."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "A Defcon szint most: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "Az SNLINE lista törölve."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "Az SQLINE lista törölve."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "Az SZLINE lista törölve"
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10362,90 +10302,80 @@ msgstr ""
 "Megjegyzés: az AUTODEOP és NOJOIN esetén maximum szintrõl\n"
 "az összes többi esetén minimum szintrõl van szó."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "A %s hoszt aktuálisan %d sessiont használ, a határértéke %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Az utolsó memo, amit %s részére (%s idõpontban) küldtél már olvasott."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Az utolsó memo, amit %s részére (%s idõpontban) küldtél még olvasatlan."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Nem változtathatod meg %s üzeneteinek számát."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Az új megjelenítés: %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "A nicked %s meg lett változtatva erre: %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Összesen %d üzenet van a %s csatornán."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10453,7 +10383,8 @@ msgstr ""
 "Nem áll rendelkezésre bot.\n"
 "Kérj meg egy szervíz admint, hogy csináljon!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10463,20 +10394,12 @@ msgstr ""
 "Írd: /msg %s HELP GLIST és /msg %s HELP DROP\n"
 "bõvebb információkért."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "%d üzenete van a %s szobának."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Új üzenete érkezett a %s szobának.\n"
-"Ha szeretnéd elolvasni, írd be: /msg %s READ %s %d."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Nincsen bot kijelölve %s szobában többet."
@@ -10497,7 +10420,7 @@ msgstr "Nincs véletlenszerû hír."
 msgid "There's no email address set for your nick."
 msgstr "Nincs beállítva email cím a nevedhez."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10513,83 +10436,38 @@ msgstr ""
 "    PRIVATE          Megelõzi, hogy egy botot nem IRCop személy\n"
 "                       társíthasson"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Ez a szoba forbidolva lett."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ez a szoba a %s adatbázisában regisztrált."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "A szoba használata felfüggesztve."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Ez a csatorna nem használható."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Ez a csatorna nem fog elévülni."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Ezt a nicket már kérelmezték, ellenõrizd az e-mail cimed, egy levélben van a "
-"kódod."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"A nick az emailben elküldött kóddal való aktíválásra vár a regisztráció "
-"befejezéséhez."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Ez a nick már regisztrált.  Kérlek válassz másikat.\n"
-"Ha ez a te nicked, akkor /msg %s IDENTIFY jelszó! "
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Ez a nicknév regisztrált; te nem használhatod."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Ez a nick regisztrált és védett.  Ha ez a te nicked,\n"
-"akkor /msg %s IDENTIFY jelszó!\n"
-"Különben válassz másik nicknevet!"
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Ez a nicknév nem fog elévülni."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ez a nicknév nem használható. Kérlek válassz másikat!"
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Ez a nicknév nem fog elévülni."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10597,30 +10475,60 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Xop (Sop, Aop, Hop, Vop) lista rendszer bekapcsolása"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Témaváltás lezárása"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Témamegõrzés"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Témaváltás letiltása "
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Topic lock option for %s is now ON."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Topic lock option for %s is now ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr "Topic retention option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Topic retention option for %s is now ON."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Kapcsold ki a caps lockod!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       A kill védelem be-,kikapcsolása"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10635,7 +10543,8 @@ msgstr ""
 "olvashatja a szoba memo üzeneit. Ez megváltoztatható a\n"
 "%s LEVELS paranccsal."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10645,7 +10554,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10653,7 +10563,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10661,129 +10572,129 @@ msgstr ""
 "Írd be: /msg %s HELP SET opció bõvebb információért az\n"
 "adott opcióról."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Írd be: /msg %s SET EMAIL e-mail \n"
-"Az email címed nem lesz kiadva harmadik személynek."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Használd a: /msg %s LIST NEW parancsot"
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Használd a /msg %s READ %d parancsot."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Használd a /msg %s READ LAST parancsot."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick mód"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Írd be: /msg %s SET EMAIL e-mail \n"
+"Az email címed nem lesz kiadva harmadik személynek."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN #szoba"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN #szoba [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND #szoba"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Kitölti a modult"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Nem sikerült a betölteni a %s modult"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Nem sikerült eltávolítani a %s modult"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Ismeretlen SET opció: %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Ismeretlen STATS opció: %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Ismeretlen parancs %s. Írd be: \"/msg %s HELP\"."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Ismeretlen mód karakter: %c figyelmen kívül hagyva."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Ismeretlen beállítás %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Ismeretlen opció: %s.\n"
-"Használd /msg %s HELP SET információért."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Adatbázis mentve."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Felhasználó\t : %6d bejegyzés, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"User claiming your nick has been killed.\n"
-"/msg %s RELEASE %s to get it back before %s timeout."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "Fehasználó társítása szobával kivétel."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10791,16 +10702,35 @@ msgstr ""
 "Felhasználó lista:\n"
 "Nick                 Maszk"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP #csatorna { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "A megadott csatorna (%s) új foundere: %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Olvassa a sessionok hoszt listáját"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Voices védelme"
 
@@ -10826,16 +10756,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Figyelj a stílusra kiskomám!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Már tagja vagy ennek a csoportnak: %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Már be vagy azonosítva. :-)"
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10844,11 +10774,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Te nem vagy már Szuper-Admin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Nem tartózkodhatsz ezen a csatornán."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Nem változtathatod meg a max. fogadható üzenetek számát."
 
@@ -10856,11 +10782,12 @@ msgstr "Nem változtathatod meg a max. fogadható üzenetek számát."
 msgid "You are now a SuperAdmin"
 msgstr "Most már Szuper-Admin vagy"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Most már IRC Operátor vagy!"
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10868,41 +10795,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Mostantól tagja vagy a %scsoportnak."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Nem ghostolhatod ki magad!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "%s nem tud kijelentkezni, mert õ egy Services Operator."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Nem használhatod az aktiv nickedre!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10912,7 +10840,8 @@ msgstr ""
 "Használd az AOP, SOP és VOP parancsokat helyette.\n"
 "Írd be: /msg %s HELP parancs bõvebb információért."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10923,6 +10852,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -10930,56 +10860,66 @@ msgstr ""
 "Nem használhatod a parancsot. Használd az ACCESS parancsot.\n"
 "Bõvebb információ: /msg %s HELP ACCESS"
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "%s max. bejövõ üzenetek száma nem lehet több, mint %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "A max. bejövõ üzenetek száma nem lehet több, mint %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Van %d üzeneted, ebbõl %d olvasatlan."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Van %d üzeneted, ebbõl 1 olvasatlan."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Van %d üzeneted."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Van %d üzeneted; és mind olvasatlan."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Van 1 olvasatlan üzeneted."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Van 1 üzeneted."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Jelenleg nincs üzeneted."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -10989,88 +10929,69 @@ msgstr "%d darab új üzeneted van."
 msgid "You have 1 new memo."
 msgstr "Van egy új üzeneted."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"%s küldött egy új üzenetet.\n"
-"Ha szeretnéd elolvasni, írd be: /msg %s READ %d."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "%s csatornán a tiltást levetetted magadról."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Korlátlan számú üzenetet fogadhatsz."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Nincs üzeneted."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Nem kaptál új üzenetet."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr ""
 "Használj érvényes számot idõnek. \n"
 "(Adj meg érvényes számot az idõhöz.)"
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Társítanod kellene egy botot a csatornára mielõtt használod\n"
-"ezt a parancsot, írd be /msg %s HELP ASSIGN bõvebb infókért."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "A csatornán operátornak kell lenned, hogy regisztrálhasd."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "A csatornán operátornak kell lenned, hogy regisztrálhasd."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "A nicked regisztrálásához %d másodpercnél régebben kell csatlakozva lenned."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
 "case you forget it."
 msgstr "Be kell állítanod egy E-mail címet a nicknevedhez."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Értesítést kapsz új üzenetek érkezésérõl csatlakozáskor."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Értesítést kapsz az új üzeneteidrõl,ha fellépsz az IRC-re."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Értesítést kapsz új üzenetek érkezésekor."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Ezentúl nem tudsz üzeneteket fogadni."
 
@@ -11078,7 +10999,7 @@ msgstr "Ezentúl nem tudsz üzeneteket fogadni."
 msgid "You will no longer be informed via email."
 msgstr "Már nem kapsz értesítést emailben."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Nem kapsz értesítést az új üzeneteidrõl."
 
@@ -11086,18 +11007,20 @@ msgstr "Nem kapsz értesítést az új üzeneteidrõl."
 msgid "You will now be informed about new memos via email."
 msgstr "Az új memo üzeneteidrõl emailben kapsz értesítést."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Ön ircdje nem támogatja a videnteket, ha ez nem igaz,\n"
-"akkor kérem jelentse ezt, mint lehetséges hibát."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Már be vagy azonosítva. :-)"
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11113,35 +11036,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Your access list is empty."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Összes O:lines %s módosítva."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Mellõzöttek lista üres."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Ezentúl korlátlan számú üzenetet fogadhatsz."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "A max. bejövõ üzenetek számanak új értéke: %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "A max. bejövõ üzentek száma: %d,ez fix érték."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "A maximálisan fogadható üzentek száma:  %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "A max. bejövõ üzentek száma: 0; és több nem jöhet."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11149,61 +11093,57 @@ msgstr ""
 "A max. bejövõ üzentek száma: 0; és nem köhet több. \n"
 "Ez nem változtatható meg."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "A nicked sikeresen kijelentkezett."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "A nicked már regisztrált; írd be /msg %s DROP elõször."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "A neved még nem regisztrált."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "A nickneved dropolva lett,"
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "A nickneved most meg lesz változtatva: %s."
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "A kód újra el lett küldve erre a címre: %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Jelszavad: %s - jegyezd meg a késõbbi használathoz!"
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "A %s virtuális hosztod aktiválva."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "A  %s@%s virtuális hosztod aktiválva."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11222,94 +11162,95 @@ msgstr "[Oper Hír] - %s %s"
 msgid "[Random News - %s] %s"
 msgstr "[Véletlenszerû Hír] - %s %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "nem fog elévülni"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "elévül a következõ adatbázis mentésnél"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "elévül %d nap múlva"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "elévül %d nap múlva"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "elévül %d óra, %d perc múlva"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "elévül %d perc múlva"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "elévül %d perc múlva"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "%s vhosztja törölve lett."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "%s vhostja erre változott: %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "%s vhostja erre változott: %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "A %s csoport vhostja %s lett."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "A %s csoport vhostja erre változott: %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "A %s csoport vhostja törölve."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "xOP lista rendszer"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "xOP lists system for %s is now ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "xOP lists system for %s is now ON."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11318,558 +11259,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | #szoba} memo-szöveg"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s hozzáadva %s AOP listához."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s hozzáadva %s HOP listához."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s hozzáadva %s SOP listához."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s hozzáadva %s VOP listához."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s törölve lett a %s HOP listáról."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s törölve lett a %s SOP listáról."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s törölve lett a %s VOP listáról."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s  áthelyezve a %s HOP listára."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s  áthelyezve a %s SOP listára."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s  áthelyezve a %s VOP listára."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s nem találatható a %s HOP listán."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s nem találatható a %s SOP listán."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s nem találatható a %s VOP listán."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr "    PRIVATE    A nickneved /msg %s LIST -ból való elrejtése"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d nap"
-
-#~ msgid "%d hours"
-#~ msgstr "%d óra"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d perc"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d másodperc"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "%s HOP listája üres."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "%s SOP listája üres."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "%s VOP listája üres."
-
-#~ msgid "1 day"
-#~ msgstr "1 nap"
-
-#~ msgid "1 hour"
-#~ msgstr "1 óra"
-
-#~ msgid "1 minute"
-#~ msgstr "1 perc"
-
-#~ msgid "1 second"
-#~ msgstr "1 másodperc"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Használhatja a CLEAR parancsot."
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Használhatja a HALFOP/DEHALFOP parancsokat"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Channel %s HOP list has been cleared."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Channel %s SOP list has been cleared."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Channel %s VOP list has been cleared."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d bejegyzés törölve a %s HOP listáról."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d bejegyzés törölve a %s SOP listáról."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d bejegyzés törölve a %s VOP listáról."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 bejegyzés törölve a %s HOP listáról."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 bejegyzés törölve a %s SOP listáról."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 bejegyzés törölve a %s VOP listáról."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "E-mail cím törölve."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP #szoba { ADD | DEL | LIST | CLEAR }[ nick | sorszám]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Vége a felhasználó listának."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "%s csatorna belépõ üzenete törölve."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "A Bot nincs a %s csatornán."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "    Köszöntõ üzenet: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Access list for %s is empty."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "%s hozzáférési listája:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "%s csatorna belépõ üzenete megváltozott."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Fantasy mód most OFF a %s csatornán."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Üdvözlõ mód most OFF a %s szobán."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s HOP listája:\n"
-#~ "  Sorszám  Nicknév"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Belsõ hiba - nem teljesíthetõ kérés."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Logon news tétel #%d törölve."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nicknév Regisztráció (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Nicknév jelszó (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Nincs # a szoba neve elõtt."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Nincs Bot mód most OFFa %s szobán."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Nincs ilyen bejegyzés a %s HOP listán."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Nincs ilyen bejegyzés a %s SOP listán."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Nincs ilyen bejegyzés a %s VOP listán."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Nem található (#%d) a %s AOP listán."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Nem található (#%d) a %s HOP listán."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Nem található (#%d) a %s SOP listán."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Nem található (#%d) a %s VOP listán."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice option for %s is now OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace option for %s is now OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr "Kérlek, várj %d másodpercet mielõtt SEND parancsot újra használod!"
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Private mód a %s botban most OFF."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private option for %s is now OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "A Kill védelem opció most már ON, késleltetés nélkül."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER jelszó [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Restricted access option for %s is now OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s SOP listája:\n"
-#~ "  Sorszám  Nicknév"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s not registered"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND #szoba [indok]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure founder option for %s is now OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure ops option for %s is now OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure option for %s is now OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Szervíz nem tudja változtatni a módokat.\n"
-#~ "A szervereid jól vannak beállítva?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Szervíz fent van %d nap, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Szervíz fent van %d óra, %d perce"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Szervíz fent van %d óra, %d perce"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Szervíz fent van %d óra, %d perce"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Szervíz fent van %d perc, %d másodperce."
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Szervíz fent van %d perc, %d másodperce."
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Szervíz fent van %d perc, %d másodperce."
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signed kick option for %s is now OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Csatorna HOP lista módosítás szünetel."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Csatorna SOP lista módosítás szünetel."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Csatorna VOP lista módosítás szünetel."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Csak %d számú helyed van a csatorna VOP/AOP/SOP listán."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Együttélés mód most OFFa %s szobán."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Syntax: RANDOMNEWS ADD szöveg"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR #szoba mit?"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Syntax: OPERNEWS ADD szöveg"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Syntax: SET DEBUG {ON | OFF | szám}\n"
-#~ "\n"
-#~ "Be vagy kikapcsolja a debug módot. Debug módban, minden a\n"
-#~ "Szervíznek és a szervíz által küldött üzenet és persze még\n"
-#~ "sok más üzenet rögzítésere kerül a naplófájlban. Ha megadsz\n"
-#~ "számot is, akkor a debug mód bekapcsol és a megadott szinten\n"
-#~ "fog muködni.\n"
-#~ "\n"
-#~ "Ez az opció megegyezik a parancs-sorban kiadható opcióval:\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Szintaktika: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic lock option for %s is now OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Topic retention option for %s is now OFF."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Ismeretlen Parancs %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Ismeretlen opció: %s.\n"
-#~ "További információért írd be: /msg %s HELP KICK "
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "%s felhasználó nincs a nickserv db fájlban."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s VOP listája:\n"
-#~ "  Sorszám  Nicknév"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "A %s nevû bot törölve."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] A memo, amit %s számára küldtél meg lett tekintve."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "%s részére küldött utolsó memo üzenet visszavonva."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "A %s virtuális hosztod aktiválva."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "A %s nevû bot törölve."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po
index 46b9e2984..36a70b121 100644
--- a/language/anope.it_IT.po
+++ b/language/anope.it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:40-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Italian\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s per altre informazioni."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s ha cambiato il livello DEFCON a %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s aggiunto alla lista di accesso di %s con il livello %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s aggiunto alla lista autokick di %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s aggiunto alla lista delle parolacce di %s."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s aggiunto alla lista AKILL."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s aggiunto alla lista SNLINE."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s aggiunto alla lista SQLINE."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s aggiunto alla lista SZLINE."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "Per maggiori informazioni su un comando specifico,\n"
 "digita /msg %s HELP comando."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s ti permette di avere un bot nel tuo canale.\n"
 "E' un servizio pensato per gli utenti che non possono\n"
@@ -53,8 +111,8 @@ msgstr ""
 "Per maggiori informazioni sull'uso di un comando\n"
 "specifico, digita /msg %s HELP comando."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -73,124 +131,56 @@ msgstr ""
 "un comando specifico, digita /msg %s HELP comando.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s è un servizio che permette agli utenti della rete di\n"
-"scambiarsi brevi messaggi (memo), anche se i destinatari non\n"
-"sono connessi; permette inoltre di inviare messaggi ai canali(*).\n"
-"Il nick del mittente e quello del destinatario (o il canale\n"
-"di destinazione) devono essere registrati.\n"
-"\n"
-"I comandi di %s sono:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s ha cambiato il livello DEFCON a %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s aggiunto alla lista di accesso di %s con il livello %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s aggiunto alla lista autokick di %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s aggiunto alla lista delle parolacce di %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s aggiunto alla lista AKILL."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s aggiunto alla lista SNLINE."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s aggiunto alla lista SQLINE."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s aggiunto alla lista SZLINE."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s è già presente nella lista delle parolacce di %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s è già presente nella lista autokick di %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s è già presente nella lista AKILL."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s esiste già nella lista EXCEPTION."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s è già presente nella lista SNLINE."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s è già prsente nella lista SQLINE."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s è già presente sulla lista SZLINE."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s non può essere utilizzato come il numero di kick che porta al ban."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s ha modificato i tuoi modi utente."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -204,42 +194,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s eliminato dalla lista AOP di %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s è stato eliminato dalla lista di accesso di %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s è stato eliminato dalla lista autokick di %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s è stato eliminato dalla lista delle parolacce di %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s eliminato dalla lista delle eccezioni."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s eliminato dalla lista AKILL."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s eliminato dalla lista SNLINE."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s eliminato dalla lista SQLINE."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s eliminato dalla lista SZLINE."
@@ -249,71 +239,80 @@ msgstr "%s eliminato dalla lista SZLINE."
 msgid "%s deleted from your access list."
 msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s disabilitato sul canale %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s ha registrato troppi nick."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s è un servizio che permette agli utenti della rete di\n"
+"scambiarsi brevi messaggi (memo), anche se i destinatari non\n"
+"sono connessi; permette inoltre di inviare messaggi ai canali(*).\n"
+"Il nick del mittente e quello del destinatario (o il canale\n"
+"di destinazione) devono essere registrati.\n"
+"\n"
+"I comandi di %s sono:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s è già coperto da %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "La maschera %s è stata aggiunta alla tua lista di accesso."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s non è un tipo di ban valido."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s non è un bot valido o un canale registrato."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s non è un indirizzo e-mail valido."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s al momento non è nel canale %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s non trovato nella lista ignore."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s corrisponde a un'eccezione %s e non può essere bannato finché l'eccezione "
-"non sarà rimossa."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -324,12 +323,12 @@ msgstr "%s spostato alla lista AOP di %s."
 msgid "%s not found on %s %s list."
 msgstr "%s non trovato nella lista AOP di %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s non trovato nella lista nella lista di accesso di %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s non trovato nella lista autokick di %s."
@@ -339,32 +338,32 @@ msgstr "%s non trovato nella lista autokick di %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s non trovato nella lista delle parolacce di %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s non trovato nella lista delle sessioni."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "Impossibile trovare %s nella lista delle eccezioni."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s non trovato nella lista AKILL."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s non trovato nella lista SNLINE."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s non trovato nella lista SQLINE."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s non trovato nella lista SZLINE."
@@ -374,12 +373,17 @@ msgstr "%s non trovato nella lista SZLINE."
 msgid "%s not found on your access list."
 msgstr "La maschera %s non è stata trovata nella tua lista di accesso."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "La maschera %s non è stata trovata nella tua lista di accesso."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "La maschera %s è stata eliminata dalla tua lista di accesso."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -403,18 +407,12 @@ msgstr "%s sarà ignorato per  %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s sarà ignorato permanentemente."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Nota: Tutti i comandi inviati a %s sono loggati!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Nota: i Services sono in modalità read-only; le modifiche non saranno "
-"salvate!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -422,11 +420,12 @@ msgstr ""
 "Nota: le mask delle AKILL non possono contenere nick; assicurati di non aver "
 "incluso una porzione di nick nella mask."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Nota: puoi aggiungere solo mask dell'ip alla lista SZLINE."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -479,22 +478,22 @@ msgstr "[auto-memo] Il memo che hai inviato è stato letto."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER password email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER password email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP destinatario password"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -512,7 +511,7 @@ msgstr ""
 "o per altre azioni maliziose. L'abuso di %s\n"
 "risulterà, come minimo, nella perdita del proprio nick."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -525,7 +524,8 @@ msgstr ""
 "la lista di accesso, la lista AKICK e le liste di configurazione\n"
 "dei livelli per qualsiasi canale."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -536,989 +536,345 @@ msgstr ""
 "senza doversi identificare per quel nick, e possono visualizzare\n"
 "le liste di accesso per qualunque nick (/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "Opzioni: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "                      vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \t      vhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Nick del bot: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "Nick del bot: nessun bot assegnato."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "                    Opzioni: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "   Kick in caso di maiuscole: %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "   Kick in caso di maiuscole: %s (%d portano al ban; minimo %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "   Kick in caso di maiuscole: %s (minimo %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "            Fondatore: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "          Tipo di ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "   Kick in caso di grassetto: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick in caso di grassetto: %s (%d kick portano al ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kick in caso di flood: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 "       Kick in caso di flood: %s (%d kick portano al ban; %d linee in %d "
 "secondi)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kick in caso di flood: %s (%d linee in %d secondi)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "        Hostmask: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kick in caso di colori: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kick in caso di colori: %s (%d portano al ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "          Tipo di ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "      Ultimo utilizzo: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Modi bloccati: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr " Kick in caso di ripetizioni: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr " Kick in caso di ripetizioni: %s (%d kick portano al ban; %d volte)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr " Kick in caso di ripetizioni: %s (%d volte)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "           Successore: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Sospeso: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "   Kick in caso di maiuscole: %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "   Kick in caso di grassetto: %s (%d kick portano al ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "             Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "             Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "         Ultimo topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "Data di registrazione: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (disabilitato)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (solo per il fondatore)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Modifica la lista degli indirizzi autorizzati"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Modifica la lista degli utenti con privilegi"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr "ACT          Invia un /me in canale"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Modifica la lista AutoKick"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Modifica la lista AutoKick"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Manipola la lista AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      Mostra i canali in cui si ha accesso"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Modifica la lista degli utenti AOP"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN       Assegna un bot a un canale"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS     Gestisce la lista delle parolacce"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Permette di bannare un utente"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       Imposta il tipo di ban che sarà usato dai Services"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT          Gestisce la lista dei bot disponibili"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST      Mostra la lista dei bot disponibili"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Annulla l'ultimo memo inviato"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL tutti gli utenti su di un canale specifico"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Mostra tutti i canali"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Controlla se l'ultimo memo ad un nick è stato letto"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Annulla varie impostazioni del canale"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Conferma un \"auth code\" di nickserv"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "Data di crazione: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipola il sistema DefCon"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Toglie lo stato di mezzo operatore a un utente "
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Rimuove il vhost di un altro utente"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Cancella uno o più memo"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Rimuove il vhost da tutti i nick di un gruppo"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Toglie lo stato di operatore a un utente (-o)"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Toglie lo stato di owner a un utente "
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Toglie lo stato di protezione a un utente "
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Imposta la descrizione del canale"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Toglie lo stato di voice a un utente (-v)"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Imposta il nome del gruppo"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Imposta il nome del tuo gruppo"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Annulla la registrazione di un canale"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Annulla la registrazione del nick"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "          Descrizione: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associa un indirizzo e-mail al nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Associa un indirizzo e-mail al tuo nick"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr ""
-"    EXCEPTION   Modifica la lista delle eccezioni al limite delle\n"
-"                sessioni"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Blocca un canale in modo che non venga usato"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Blocca un nick in modo che non venga usato"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Imposta il fondatore del canale"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Mostra l'elenco degli utenti registratisi con l'indirizzo "
-"email specificato"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Recupera la password (chiave) di un canale"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Recupera la password di un nick\n"
-"               (solo se la criptazione è disattivata)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnette un nick fantasma che non è ancora caduto"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Mostra la lista di tutti i nick nel proprio gruppo"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Invia un messaggio a tutti gli utenti"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associa un messaggio di saluto al nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Associa un messaggio di saluto al tuo nick"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Sincronizza il vhost per tutti i nick nel gruppo"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Entra in un gruppo"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Messaggio di saluto (greet): %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Assegna lo stato di mezzo operatore a un utente (+h)"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Nasconde alcune informazioni sul tuo nick"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Modifica la lista degli utenti HOP"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Ti identifica per il tuo nick"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modifica la lista ignore dei Services"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modifica la lista ignore dei Services"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr "INFO         Mostra informazioni su un bot o su un canale"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Mostra le informazioni su un nick"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Mostra le informazioni su un canale"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Mostra informazioni sui tuoi nuovi memo"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        Disabilita (\"jupiter\") un server"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     Mantiene il topic quando il canale non è in uso"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK         Configura i kick"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kicka un utente da un canale"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Espelle un utente da un canale (kick)"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Attiva o disattiva la protezione"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr "    LANGUAGE   Imposta la lingua utilizzata dai Services"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Ridefinisce i privilegi dei livelli di accesso"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Mostra uno o più vhost nel database"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr "    LIST       Mostra l'elenco dei nick registrati"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr "    LIST       Mostra la lista dei canali"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Mostra la lista dei propri memo"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Definisce i messaggi da mostrare agli utenti\n"
-"                quando si connettono"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Deidentifica dal proprio nick"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Cambia dei modi di un canale"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  \"Pulisce\" i modi di un canale"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Informazioni su un modulo caricato"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Elenca i moduli caricati"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Carica un modulo"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Carica un modulo"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Rimuovi un modulo"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Cambia il metodo di comunicazione usato dai Services"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Evita che il nickname scada"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr "    NOOP        Rimuove temporaneamente tutte le O:line di un server"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Disattiva il tuo vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Imposta le operflag di un utente"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Attiva il tuo vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Assegna lo stato di operatore a un utente (+o)"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS    Definisce i messaggi da mostrare agli operatori"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Invia una notifica quando vengono usati i comandi\n"
-"                     OP/DEOP"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Assegna lo stato di owner a un utente (+q)"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "         Opzioni: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Imposta la password del nick"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Imposta la password del tuo nick"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Regola l'uso dei comandi critici"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Nasconde il canale dall'output del comando LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %s LIST)"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Assegna lo stato di protezione a un utente (+a)"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Termina i Services senza salvare i database"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Definisce i messaggi da mostrare casualmente\n"
-"                agli utenti quando si connettono"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Legge uno o più memo"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Disconnette un altro utente che usa il tuo nick"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Registra un nick"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Registra un nick"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE    Permette di usare di nuovo il proprio nick dopo un RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Rilegge il file di configurazione dei Services"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Reinvia un \"auth code\" di nickserv"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Salva i database e riavvia i Services"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Limita l'accesso al canale"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Invia un memo e richiede una notifica di lettura"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "     Kick in caso di reverse: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick in caso di reverse: %s (%d kick portano al ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Imposta le opzioni SET su un altro nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr "SAY          Fa sì che il bot dica qualcosa in canale"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Attiva le funzionalità di sicurezza di %s"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Attiva o disattiva la sicurezza"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr ""
-"    SECUREFOUNDER Abilita un controllo più severo dello stato di\n"
-"                     fondatore"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr ""
-"    SECUREOPS     Abilita un controllo più severo dello stato di\n"
-"                     operatore"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Invia un memo a un nick o a un canale"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL Invia un memo a tutti gli utenti registrati"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Invia la password del proprio nick via e-mail"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Mostra la lista delle sessioni degli host"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET          Imposta le opzioni del bot"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Imposta il vhost di un altro utente"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Imposta varie opzioni globali dei Services"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Imposta le opzioni e le informazioni di canale"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Imposta le opzioni, inclusa la protezione"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Imposta le opzioni relative ai memo"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Imposta il vhost per tutti i nick di un gruppo"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Termina i Services salvando i database"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      \"Firma\" i kick effettuati con il comando KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Manipola la lista SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Modifica la lista degli utenti SOP"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Manipola la lista SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Mostra lo staff dei services con stato online"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF Invia un memo a tutti gli opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Mostra lo stato dei Services e della rete"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS      Restituisce il livello di accesso corrente di\n"
-"                un utente su un canale"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Indica lo stato di identificazione di un nick"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Imposta il successore del fondatore del canale"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Impedisce l'utilizzo di un canale mantenendo\n"
-"               i dati e le impostazioni"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Sospendi il nick specificato"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forza il cambio del nickname di un utente"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Manipola la lista SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Cambia il topic di un canale"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr ""
-"    TOPICLOCK     Imposta il blocco del topic (modificabile solo\n"
-"                     attraverso il comando TOPIC)"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Cambia i modi utente di un utente"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN     Rimuove il bot da un canale"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Rilascia un canale sospeso"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Rilascia il nick specificato"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Forza la scrittura su disco immediata dei database\n"
-"                dei Services"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Aggiorna il tuo stato attuale, ovvero controlla eventuali "
-"nuovi memo"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Mostra tutti gli utenti"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "        Usato su: %d canale/i"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Assegna lo stato di voice a un utente (+v)"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Modifica la lista degli utenti VOP"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Seleziona il sistema di privilegi utilizzato"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (scade tra %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "   Kick in caso di parolacce: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick in caso di parolacce: %s (%d kick portano al ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "           Indirizzo e-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "                Connesso da: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "             Ultimo accesso: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Topic impostato da: %s"
@@ -1528,20 +884,6 @@ msgstr "   Topic impostato da: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1552,26 +894,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1581,98 +914,81 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "        Realname: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "       Ora di registrazione: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kick in caso di sottolineato: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kick in caso di sottolineato: %s (%d portano al ban ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Mittente          Data/Ora"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr "\"/msg %s\" non è più supportato. Usa \"/msg %s@%s\" o \"/%s\"."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        Disabilita (\"jupiter\") un server"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (aggiunto da %s il %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1691,17 +1007,12 @@ msgstr ""
 "%5d (%s, aggiunto da %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Comandi di %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s non viene informato dei nuovi memo."
@@ -1711,34 +1022,34 @@ msgstr "%s non viene informato dei nuovi memo."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (aggiunto da %s il %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Moduli caricati."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bot disponibili."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nick nel gruppo."
@@ -1749,14 +1060,14 @@ msgstr "%d nick nel gruppo."
 msgid "%s %s list is empty."
 msgstr "La lista AOP di %s è vuota."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista di accesso di %s è vuota."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "La lista autokick di %s è vuota."
@@ -1766,7 +1077,7 @@ msgstr "La lista autokick di %s è vuota."
 msgid "%s bad words list is empty."
 msgstr "La lista delle parolacce di %s è vuota."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
@@ -1777,48 +1088,47 @@ msgstr ""
 msgid "%s cannot receive memos."
 msgstr "%s non può ricevere memo."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Comandi di %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr ""
-"%s La copertura è troppo ampia; per favore, usa una maschera più specifica."
+msgid "%s commands:"
+msgstr "Comandi di %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ha %d memo, di cui %d non sono stati ancora letti."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ha %d memo, di cui 1 non è stato ancora letto."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ha %d memo."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ha %d memo, nessuno dei quali è stato letto."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ha 1 memo, e non è stato ancora letto."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s ha 1 memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s non ha alcun memo."
@@ -1828,47 +1138,27 @@ msgstr "%s non ha alcun memo."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s attualmente ha troppi memo e non può riceverne altri."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s non ha alcun limite dei memo."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s non ha nuovi memo."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s non ha nuovi memo."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s è %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s è un services operator di tipo %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s al momento è offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s è online in questo momento."
@@ -1890,23 +1180,23 @@ msgstr "%s è attivato"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s non è più un SuperAdmin."
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s non viene informato dei nuovi memo."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s viene informato dei nuovi memo quando si connette e quando li riceve."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s viene informato dei nuovi memo quando si connette."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s viene informato dei nuovi memo quando li riceve."
@@ -1925,6 +1215,11 @@ msgstr ""
 "Lista AOP di %s:\n"
 "  Num  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1963,63 +1258,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) aggiunto alla lista dei bot."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Il limite dei memo di %s è %d, e non può essere modificato."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Il limite dei memo di %s è %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL tutti i nuovi client che si collegano"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Forza l'impostazione dei modi canale (%s) su tutti i canali"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora tutti i non-opers con messaggio"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killa tutti i NUOVI client che si collegano"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Nessune modifiche ad MLOCK"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Nessuna nuova registrazione di canali"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Niente nuovi memo inviati"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Nessuna nuova registrazione di nick"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Ignora silenziosamente i non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa il limite di sessioni ridotto a %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<sconosciuto>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Un memo di massa è stato inviato a tutti gli utenti registrati."
 
@@ -2032,40 +1330,30 @@ msgstr ""
 "Un memo di notifica è stato mandato a %s informandolo/a che hai\n"
 "letto il suo memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Un codice di attivazione è stato inviato a %s. Digita /msg %s CONFIRM "
 "<codice> per completare la registrazione."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "L'ident per un vhost dev'essere nel formato di un ident valido"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr ""
-"Errore! Un vhost può contenere soltanto i caratteri A-Z, a-z, 0-9, '.' e '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS canale {ADD|DEL|LIST|VIEW|CLEAR} [nick [livello] | numero-lista]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT canale testo"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
@@ -2079,17 +1367,22 @@ msgstr ""
 "AKICK canale {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-o-usermask] [motivo]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE su %s completato; ne sono stati influenzati %d utenti."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL tutti gli utenti su di un canale specifico"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "La lista AKILL è vuota."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2098,43 +1391,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canale nick-del-bot"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Accesso negato."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Il livello di accesso di %s su %s è stato modificato a %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Il livello di accesso di %s su %s non è stato modificato da %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Il livello di accesso deve essere compreso tra %d e %d (inclusi)."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Il livello di accesso deve essere diverso da zero."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Impostazioni dei livelli di accesso del canale %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
@@ -2150,20 +1434,11 @@ msgstr "La lista d'accesso per %s è vuota."
 msgid "Access list for %s:"
 msgstr "Lista di accesso di %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Lista di accesso di %s:\n"
-"  Num   Liv  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista di accesso:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2172,6 +1447,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Attiva le funzionalità di sicurezza di %s"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Attiva il tuo vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2192,7 +1477,7 @@ msgstr "Aggiunta una nuova Oper News (numero %d)."
 msgid "Added new random news item (#%d)."
 msgstr "Aggiunta una nuova Random News (numero %d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2205,22 +1490,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Tutte le O:lines di %s sono state rimosse."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Tutte le O:lines di %s sono state ripristinate."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
@@ -2229,12 +1514,12 @@ msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 msgid "All logon news items deleted."
 msgstr "Tutte le Logon News sono state eliminate."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Tutti i memo per il canale %s sono stati cancellati."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Tutti i tuoi memo sono stati cancellati."
 
@@ -2246,22 +1531,22 @@ msgstr "Tutte le Oper News sono state eliminate."
 msgid "All random news items deleted."
 msgstr "Tutte le Random News sono state eliminate."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Tutti gli utenti sono stati kickati dal canale %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Tutti i vhost nel gruppo %s sono stati impostati a %s@%s"
@@ -2383,12 +1668,32 @@ msgstr "Permette l'uso dei comandi \"fantasia\" del bot"
 msgid "Allowed to view the access list"
 msgstr "Permette la visione della lista di accesso"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr "INFO         Mostra informazioni su un bot o su un canale"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN       Assegna un bot a un canale"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Associa un messaggio di saluto al tuo nick"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Associa un indirizzo e-mail al tuo nick"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista autokick di %s:"
@@ -2413,18 +1718,18 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Modo di canale +v automatico (voice)"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canale {ADD|DEL|LIST|CLEAR} [parola | numero-lista] [SINGLE|START|"
 "END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2443,26 +1748,26 @@ msgstr ""
 "Lista delle parolacce di %s:\n"
 "  Num   Parola                         Tipo"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "La lista delle parolacce è stata svuotata."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Il tipo di ban del canale %s ora è #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Permette di bannare un utente"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Il bot %s è già esistente."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Il bot %s non esiste."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Il bot %s è stato assegnato a %s."
@@ -2477,27 +1782,27 @@ msgstr "Il bot %s è stato modificato; ora si presenta come %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Il bot %s è stato eliminato."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Il bot %s è già assegnato al canale %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Il bot kickerà anche gli operatori sul canale %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Il bot kickerà anche i voice sul canale %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Il bot non kickerà gli operatori sul canale %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Il bot non kickerà i voice sul canale %s."
@@ -2527,16 +1832,11 @@ msgstr "Gli ident dei bot possono contenere unicamente caratteri validi."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "I nick dei bot possono contenere unicamente caratteri validi."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Il bot non è sul canale %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Lista dei bot disponibili:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2545,7 +1845,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2556,7 +1856,7 @@ msgstr ""
 "%d kick nei confronti dello stesso utente. Usa il comando BADWORDS\n"
 "per aggiungere o rimuovere le parolacce dalla lista."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2564,7 +1864,7 @@ msgstr ""
 "Il bot ora kickerà chi dice le parolacce. Usa il comando BADWORDS\n"
 "per aggiungere o rimuovere le parolacce dalla lista."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2573,11 +1873,11 @@ msgstr ""
 "Il bot ora kickerà chi usa il grassetto, e piazzerà un ban dopo \n"
 "%d kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Il bot ora kickerà chi usa il grassetto."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2588,7 +1888,7 @@ msgstr ""
 "%d caratteri e il %d%% dell'intero messaggio), e piazzerà un ban\n"
 "dopo %d kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2597,7 +1897,7 @@ msgstr ""
 "Il bot ora kickerà chi usa le maiuscole (devono costituire almeno\n"
 "%d caratteri e il %d%% dell'intero messaggio)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2606,11 +1906,11 @@ msgstr ""
 "Il bot ora kickerà chi usa i colors, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Il bot ora kickerà chi usa i colori."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2619,12 +1919,12 @@ msgstr ""
 "Il bot ora kickerà chi flooda (%d linee in %d secondi), e\n"
 "piazzerà un ban dopo %d kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Il bot ora kickerà chi flooda (%d linee in %d secondi)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2633,11 +1933,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2648,7 +1948,7 @@ msgstr ""
 "volte la stessa cosa), e piazzerà un ban dopo %d kick\n"
 "nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2657,7 +1957,7 @@ msgstr ""
 "Il bot ora kickerà chi ripete (gli utenti che ripetono %d\n"
 "volte la stessa cosa)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2666,11 +1966,11 @@ msgstr ""
 "Il bot ora kickerà chi usa i reverse, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Il bot ora kickerà chi usa i reverse."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2679,16 +1979,16 @@ msgstr ""
 "Il bot ora kickerà chi usa il sottolineato, e piazzerà un ban dopo %d \n"
 "kick nei confronti dello stesso utente."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Il bot ora kickerà chi usa il sottolineato."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Il bot ora kickerà chi usa i colori."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2697,182 +1997,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Il bot non kickerà più chi dice le parolacce."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Il bot non kickerà più chi usa il grassetto."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Il bot non kickerà più chi usa le maiuscole."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Il bot non kickerà più chi usa i colori."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Il bot non kickerà più chi flooda."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Il bot non kickerà più chi ripete."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Il bot non kickerà più chi usa i reverse."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Il bot non kickerà più chi usa il sottolineato."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Il bot non kickerà più chi usa le maiuscole."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ:     %6d records, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bot riservati agli IrcOp:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes letti:   %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes scritti: %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canale}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [testo|numero]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+scadenza] {#canale} [motivo]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canale [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR canale cosa"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Annulla l'ultimo memo inviato"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Annulla la registrazione di un canale"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Annulla la registrazione del nick"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Impossibile inviare e-mail adesso; riprova più tardi."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Lista dei bot disponibili:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "La lista d'accesso per %s è vuota."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Lista di accesso di %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ:    %6d records, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Modi utente di %s modificati."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s ha modificato i tuoi modi utente."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Il canale %s non esiste."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Cambia il metodo di comunicazione usato dai Services"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Modi utente di %s modificati."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Il canale %s è stato deregistrato."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Il canale %s è stato vietato da %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Il canale %s è già registrato!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Il canale %s non può più essere registrato o usato."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Il canale %s ora è stato rilasciato."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Il canale %s is ora è sospeso."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Il canale %s non è registrato."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Il canale %s non può essere registrato o usato."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Il canale %s non può essere registrato."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Il canale %s è stato registrato sotto il tuo nick: %s."
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canali:      %6d records, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Il canale %s scadrà."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Il canale %s non scadrà."
@@ -2882,33 +2207,28 @@ msgstr "Il canale %s non scadrà."
 msgid "Channel %s %s list has been cleared."
 msgstr "La lista AOP del canale %s è stata svuotata."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista di accesso del canale %s è stata svuotata."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "La lista autokick del canale %s è stata svuotata."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Il canale %s ora è stato rilasciato."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Il canale %s non è un canale valido."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Le SQLINE di canale non sono supportate da questo IRCd e sono pertanto "
 "inutilizzabili."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2916,7 +2236,7 @@ msgstr ""
 "Lista dei canali:\n"
 "Nome                 Utenti Modi    Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2925,7 +2245,7 @@ msgstr ""
 "Canali su cui %s ha accesso:\n"
 "  Num  Canale               Livello  Descrizione"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2933,16 +2253,47 @@ msgstr ""
 "Canali su cui hai accesso:\n"
 "  Num  Canale               Livello  Descrizione"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Controlla se l'ultimo memo ad un nick è stato letto"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET          Imposta le opzioni del bot"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK         Configura i kick"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Conferma un \"auth code\" di nickserv"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  \"Pulisce\" i modi di un canale"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossibile rilasciare il canale %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Lista AKILL attuale:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2950,15 +2301,15 @@ msgstr ""
 "Lista AKILL attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Lista moduli attuali:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Lista SNLINE attuale:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2966,11 +2317,11 @@ msgstr ""
 "Lista SNLINE attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Lista SQLINE attuale:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2978,11 +2329,11 @@ msgstr ""
 "Lista SQLINE attuale:\n"
 "  Num   Mask                              Motivo"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Lista SZLINE attuale:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2991,7 +2342,7 @@ msgstr ""
 "  Num   Mask                              Motivo"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Lista delle eccezioni attuale:"
 
@@ -3015,56 +2366,61 @@ msgstr "Numero attuale di SQLINE: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Numero attuale di SZLINE: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Utenti correnti: %d (%d operatori)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canale] {numero | lista | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP canale"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Disattiva il tuo vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3189,6 +2545,45 @@ msgstr "Durata di default delle SZLINE: 1 minuto"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Durata di default delle SZLINE: infinita"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Definisce i messaggi da mostrare agli utenti\n"
+"                quando si connettono"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Definisce i messaggi da mostrare agli utenti\n"
+"                quando si connettono"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS    Definisce i messaggi da mostrare agli operatori"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Toglie lo stato di mezzo operatore a un utente "
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Cancella uno o più memo"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Rimuove il vhost da tutti i nick di un gruppo"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Rimuove il vhost di un altro utente"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3199,7 +2594,7 @@ msgstr "Eliminati %d record dalla lista AOP di %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "Eliminati %d record dalla lista di accesso di %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Eliminati %d record dalla lista autokick di %s."
@@ -3239,7 +2634,7 @@ msgstr "Eliminati %d record dalla lista SZLINE."
 msgid "Deleted 1 entry from %s access list."
 msgstr "Eliminato un record dalla lista di accesso di %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Eliminato un record dalla lista autokick di %s."
@@ -3274,32 +2669,74 @@ msgstr "Eliminato 1 record dalla lista SZLINE."
 msgid "Deleted one entry from %s %s list."
 msgstr "Eliminato un record dalla lista AOP di %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Toglie lo stato di operatore a un utente (-o)"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Toglie lo stato di protezione a un utente "
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "La descrizione di %s è stata impostata a %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Toglie lo stato di voice a un utente (-v)"
+
+#: modules/core/ns_ghost.cpp:22
 #, fuzzy
-msgid "Disabled"
-msgstr "disattivato"
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnette un nick fantasma che non è ancora caduto"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Mostra lo staff dei services con stato online"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Mostrato tutti i records (Conteggio: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Mostrato records da %d a %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Mostrato records corrispondenti alla chiave %s (Conteggio: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Mostra le informazioni su un nick"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Mostra informazioni sui tuoi nuovi memo"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Mostra uno o più vhost nel database"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Mostra informazioni sui tuoi nuovi memo"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3328,169 +2765,211 @@ msgstr "Non usare la parola %s su questo canale!"
 msgid "Don't use underlines on this channel!"
 msgstr "Non usare il sottolineato su questo canale!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Indirizzo e-mail per %s cambiato in %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Indirizzo e-mail per %s rimosso."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "L'e-mail per %s non è valida."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametri]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Email corrispondondenti %s a %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "attivato"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Fine della lista %s."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Fine della lista di accesso."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Fine della lista dei canali."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fine della lista - %d/%d canali mostrati."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fine della lista - %d/%d risultati mostrati."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Fine della lista dei nick."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Italiano"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
-msgstr "Errore! L'ident è troppo lungo; usane uno che sia %d caratteri o meno."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
+msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Rilegge il file di configurazione dei Services"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Errore! Il vhost è troppo lungo; usane uno che sia %d caratteri o meno."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "L'eccezione per %s (numero %d) è stata spostata alla posizione %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception per %s è stata aggiornata in %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Durata di %s modificata."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID canale motivo"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID canale [motivo]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nick motivo"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [motivo]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "La modalità fantasy ora è ATTIVA sul canale %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "La modalità fantasy ora è ATTIVA sul canale %s."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s non è più ignorato."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "La maschera %s è già presente nella tua lista di accesso."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Forza la scrittura su disco immediata dei database\n"
+"                dei Services"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forza il cambio del nickname di un utente"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Invia la password del proprio nick via e-mail"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Il fondatore del canale %s ora è %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Niente WildCards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY canale"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 "Il comando GETPASS non è disponibile perché è in uso la criptazione dei dati."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [password]"
 
@@ -3498,11 +2977,26 @@ msgstr "GHOST nick [password]"
 msgid "GLOBAL message"
 msgstr "GLOBAL messaggio"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "La connessione fantasma con il tuo nick è stata disconnessa."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Imposta le operflag di un utente"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Assegna lo stato di operatore a un utente (+o)"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Assegna lo stato di owner a un utente (+q)"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Saluto"
 
@@ -3510,78 +3004,156 @@ msgstr "Saluto"
 msgid "Greet message displayed"
 msgstr "Mostra il messaggio di saluto (greet)"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Messaggio di saluto per %s cambiato in %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Messaggio di saluto per %s rimosso."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr "La modalità greet (saluto) ora è ATTIVA sul canale %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, fuzzy, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr "La modalità greet (saluto) ora è ATTIVA sul canale %s."
+
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Assegna lo stato di mezzo operatore a un utente (+h)"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Nasconde alcune informazioni sul tuo nick"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Nasconde il canale dall'output del comando LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Lista degli host con almeno %d sessioni:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY password"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO canale"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {canale | nick-del-bot}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE canale"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Ti identifica per il tuo nick"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Se non cambi il tuo nick entro 20 secondi, verrà cambiato dal server."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Se non cambi il tuo nick entro un minuto, verrà cambiato dal server."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "La lista ignore è stata annullata."
@@ -3590,12 +3162,13 @@ msgstr "La lista ignore è stata annullata."
 msgid "Ignore list is empty."
 msgstr "La lista ignore è vuota."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Lista dei bot disponibili:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3611,25 +3184,17 @@ msgstr ""
 "Digita /msg %s HELP SET opzione per avere maggiori\n"
 "informazioni su una opzione specifica."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Intervallo specificato erroneo. La sintassi corretta è #da-a."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Informazioni su un modulo caricato"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informazioni sul bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informazioni sul canale %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Tempo di scadenza non valido."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3637,14 +3202,11 @@ msgstr ""
 "Hostmask non valida. Solo le hostmask reali sono valide; le eccezioni non "
 "vengono confrontate con i nick o con gli username (ident)."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"È stato inserito un codice di attivazione non valido. Controlla di nuovo la "
-"tua casella di posta e riprova."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3653,7 +3215,7 @@ msgstr ""
 "Limite delle sessioni non valido. Deve essere un numero intero maggiore o "
 "uguale a zero e minore di %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Valore di soglia non valido. Deve essere un numero intero maggiore di 1."
@@ -3662,12 +3224,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE nomeserver [motivo]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Entra in un gruppo"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canale opzione {ON|OFF} [parametri]"
@@ -3676,262 +3243,443 @@ msgstr "KICK canale opzione {ON|OFF} [parametri]"
 msgid "KICK channel user reason"
 msgstr "KICK canale utente motivo"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "La key per il canale %s è %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kicka un utente da un canale"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Espelle un utente da un canale (kick)"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Disconnette un altro utente che usa il tuo nick"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canale {SET | DIS[ABLE] | LIST | RESET} [numero [livello]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST pattern"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canale] [lista | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP destinatario password"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Lingua cambiata a Italiano."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "L'ultimo memo inviato a %s è stato annullato."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "   Ultimo messaggio di quit: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "     Ultimo indirizzo usato: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Il livello di %s sul canale %s è stato modificato a %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Il livello deve essere compreso tra %d e %d (inclusi)."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Questo comando è inutilizzabile in questa modalità."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lista dei nick che corrispondono a %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr "    LIST       Mostra l'elenco dei nick registrati"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      Mostra i canali in cui si ha accesso"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Elenca i moduli caricati"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista dei nick nel gruppo di %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lista dei nick nel tuo gruppo:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Mostra la lista dei propri memo"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Mostra tutti i canali"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lista dei nick nel tuo gruppo:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr "    LIST       Mostra la lista dei canali"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Mostra tutti gli utenti"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST      Mostra la lista dei bot disponibili"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Mostra le informazioni su un canale"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Carica un modulo"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "I canali locali non possono essere registrati."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
+msgstr "La Logon News numero %d è stata eliminata."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Impossibile trovare la Logon News numero %d!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Lista delle Logon News:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE canale modi"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO NomeFile"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NomeFile"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NomeFile"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NomeFile"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Modifica la lista AutoKick"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS     Gestisce la lista delle parolacce"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT          Gestisce la lista dei bot disponibili"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Modifica la lista degli utenti HOP"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Modifica la lista degli utenti VOP"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr "ACT          Invia un /me in canale"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr "SAY          Fa sì che il bot dica qualcosa in canale"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Modifica la lista AutoKick"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modifica la lista ignore dei Services"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Manipola la lista AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipola il sistema DefCon"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Manipola la lista SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Manipola la lista SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Manipola la lista SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Cambia il topic di un canale"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "La maschera %s è già presente nella tua lista di accesso."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "La maschera dev'essere nel formato user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Mostra l'elenco degli utenti registratisi con l'indirizzo "
+"email specificato"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Utenti massimi: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d da %s (%s). Per eliminarlo, digita: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d da %s (%s). Per eliminarlo, digita: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Il memo %d è stato cancellato."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Il limite dei memo di %s è stato disabilitato."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Il limite dei memo di %s è stato impostato a %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Il limite dei memo di %s è stato impostato a 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Il limite dei memo è troppo alto; sarà utilizzato il valore %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo inviato a %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memo di %s. Per leggerli, digita: /msg %s READ numero"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memo di %s. Per leggerli, digita: /msg %s READ numero"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Modalità messaggio"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "        Modi bloccati: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modifica la lista ignore dei Services"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Modifica la lista degli utenti AOP"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Modifica la lista degli utenti SOP"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Modifica la lista degli indirizzi autorizzati"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Modifica la lista degli utenti con privilegi"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr ""
+"    EXCEPTION   Modifica la lista delle eccezioni al limite delle\n"
+"                sessioni"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modulo %s caricato"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modulo %s caricato"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modulo %s rimosso"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modulo: %s Versione: %s Autore: %s caricato: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modulo: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Alias (NS):  %6d records, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Gruppi (NS): %6d records, %5d kB"
@@ -3944,11 +3692,13 @@ msgstr "Permette di non venire kickati dal bot"
 msgid "New memo"
 msgstr "Nuovo memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Nuovi memo di %s. Per leggerli, digita: /msg %s READ numero"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Nuovi memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 
@@ -3956,141 +3706,107 @@ msgstr "Nuovi memo di %s. Per leggerli, digita: /msg %s READ %s numero"
 msgid "News list is full!"
 msgstr "La lista delle news è piena!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Il nick %s è stato vietato da %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Il nick %s è stato deregistrato."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Il nick %s è già registrato!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Il nick %s è un nickname non autorizzato e non può essere utilizzato."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Il nick %s è attualmente in uso."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Il nick %s ora è vietato."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Il nick %s fa parte dei servizi di questo network."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Il nick %s non è bloccato."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Il nick %s non è attualmente in uso."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Il nick %s non è registrato."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Il nick %s non può essere registrato o usato."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s non trovato nella lista ignore."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Il nick %s è stato troncato a %d caratteri."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Il nick %s scadrà."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Il nick %s non scadrà."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Il nick %s non ha un tuo memo."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Il nick %s è stato deidentificato."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Il nick %s è momentaneamente sospeso."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Il nick %s è ora rilasciato."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Il nick %s è ora sospeso."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NON registrato, prova più tardi."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Il nick %s è stato confermato."
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Il nick %s è stato deregistrato."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Il nick %s è già registrato!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Il nick %s non può essere registrato."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Il nick %s è stato registrato sotto il tuo account: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registrato."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Registrazione del nick (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4101,26 +3817,36 @@ msgstr ""
 "cancellazione automatica; saranno cioè eliminati\n"
 "dopo %d giorni di inutilizzo."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "La modalità No Bot ora è ATTIVA sul canale %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "La modalità No Bot ora è ATTIVA sul canale %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nessuna email in lista per %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Nessun bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "non scade"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Nessun aiuto disponibile per %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nessun'informazione sul modulo %s è disponibile"
@@ -4135,13 +3861,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Nessun record corrispondente nella lista AOP di %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nessun record corrispondente nella lista di accesso di %s."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nessun record corrispondente nella lista autokick di %s."
@@ -4152,39 +3878,43 @@ msgstr "Nessun record corrispondente nella lista autokick di %s."
 msgid "No matching entries on %s bad words list."
 msgstr "Nessun record corrispondente nella lista delle parolacce di %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Nessun record corrispondente nella lista delle eccezioni."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Nessun record corrispondente nella lista AKILL."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Nessun record corrispondente nella lista SNLINE."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Nessun record corrispondente nella lista SQLINE."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Nessun record corrispondente nella lista SZLINE."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Nessun memo è annullabile."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Nessn modulo attualmente caricato"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nessuna Oper News da eliminare!"
@@ -4193,16 +3923,12 @@ msgstr "Nessuna Oper News da eliminare!"
 msgid "No random news items to delete!"
 msgstr "Nessuna Random News da eliminare!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Nessun motivo"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Non invia kick \"firmati\" quando si usa SIGNKICK LEVEL is used"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Nessuna"
 
@@ -4210,7 +3936,7 @@ msgstr "Nessuna"
 msgid "Not allowed to join channel"
 msgstr "Non permette l'accesso se il canale è RESTRICTED"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4222,28 +3948,28 @@ msgstr ""
 "che si trova nella relativa lista di accesso) saranno\n"
 "automaticamente deregistrati."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Num  Limite Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flag"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4252,13 +3978,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Le vecchie informazioni sono identiche a quelle nuove."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "Su Livello Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "L'opzione Op-notice per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "L'opzione Op-notice per %s è ora ATTIVATA."
 
 #: modules/core/os_news.cpp:55
@@ -4267,133 +3998,96 @@ msgid "Oper news item #%d deleted."
 msgstr "La Oper News numero %d è stata eliminata."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Impossibile trovare la Oper News numero %d!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Lista delle Oper News:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ:    %6d records, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Le operflags %s sono state aggiunte a %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Protezione per gli op"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "L'opzione %s non può essere impostata su questa rete."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Il codice di attivazione per %s is %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Password accettata - adesso sei riconosciuto."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Autentificazione richiesta per questo comando.\n"
-"Riprova dopo aver digitato /msg %s IDENTIFY password."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password per %s cambiata in %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password per %s cambiata."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Password errata."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "La password di %s è %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Password errata."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "La password di %s è stata inviata."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Pace"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "L'opzione Peace per %s è ora ATTIVATA."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "L'opzione Peace per %s è ora ATTIVATA."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Contatta un Operatore per avere un vhost assegnato a questo nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Per favore, prova di nuovo con una password più oscura. Le password devono "
-"essere lunghe almeno 5 caratteri, non devono essere indovinate facilmente "
-"(ad es. il proprio nome o nick), e non possono contenere i caratteri di "
-"spazio e di tabulazione."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Prego utilizzare un nome server valido per jupe"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Per favore usa il simbolo # provando a registrare"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Attendi %d secondi è riprova."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Per favore attendi %d secondi prima di usare di nuovo il comando GROUP."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4411,63 +4105,120 @@ msgstr ""
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Attendi %d secondi prima di usare di nuovo il comando SEND."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Blocca un canale in modo che non venga usato"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Impedisce l'utilizzo di un canale mantenendo\n"
+"               i dati e le impostazioni"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %s LIST)"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Evita che il nickname scada"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Blocca un nick in modo che non venga usato"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privato"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "La modalità Private del bot %s ora è ATTIVA."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "La modalità Private del bot %s ora è ATTIVA."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "L'opzione Private per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now on."
 msgstr "L'opzione Private per %s è ora ATTIVATA."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Opzione private ACCESA per %s."
+
+#: modules/core/ns_set_private.cpp:36
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now on for %s."
 msgstr "Opzione private ACCESA per %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Protezione"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
+msgstr "Protezione ACCESA per %s."
+
+#: modules/core/ns_set_kill.cpp:46
+#, fuzzy, c-format
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protezione ACCESA per %s, con un ritardo ridotto."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protezione ACCESA per %s, senza ritardo."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protezione ACCESA per %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Assegna lo stato di protezione a un utente (+a)"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Fornendo il comando: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canale] {lista | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [password]"
 
@@ -4475,15 +4226,15 @@ msgstr "RECOVER nick [password]"
 msgid "REGISTER channel description"
 msgstr "REGISTER canale descrizione"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [password]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canale} testo-memo"
 
@@ -4493,292 +4244,369 @@ msgid "Random news item #%d deleted."
 msgstr "La Random News numero %d è stata eliminata."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Impossibile trovare la Random News numero %d!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Lista delle Random News:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Legge uno o più memo"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Ridefinisce i privilegi dei livelli di accesso"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
 msgstr ""
-"Il primo passo della registrazione potrebbe essere scaduto. Usa /msg %s "
-"REGISTER <password> <e-mail>."
+"    RELEASE    Permette di usare di nuovo il proprio nick dopo un RECOVER"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Registra un nick"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Registra un nick"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Regola l'uso dei comandi critici"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Rilascia un canale sospeso"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Carica un modulo"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Rilegge il file di configurazione dei Services"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Toglie lo stato di owner a un utente "
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Limita l'accesso al canale"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Restricted"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "L'opzione Restricted access per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "L'opzione Restricted access per %s è ora ATTIVATA."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     Mantiene il topic quando il canale non è in uso"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Recupera la password di un nick\n"
+"               (solo se la criptazione è disattivata)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS      Restituisce il livello di accesso corrente di\n"
+"                un utente su un canale"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Recupera la password (chiave) di un canale"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Indica lo stato di identificazione di un nick"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Deidentifica dal proprio nick"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname opzione parametri"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE numero"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY canale testo"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | canale} testo-del-memo"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 "Il comando SENDPASS non è disponibile perché è in uso la criptazione dei "
 "dati."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET canale opzione parametri"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET canale NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canale PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET canale opzione parametri"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canale DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canale DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET canale FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET canale GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canale KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET canale OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canale NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canale OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canale PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canale PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canale RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canale SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canale SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canale SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canale SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canale SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canale TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canale XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opzione parametri"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET opzione parametri"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numero"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canale] limite"
 
@@ -4786,7 +4614,7 @@ msgstr "SET LIMIT [canale] limite"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [utente | canale] {limite | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4794,24 +4622,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "La lista SNLINE è vuota."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4819,16 +4647,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista}[:"
 "motivo]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "La lista SQLINE è vuota."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4837,54 +4665,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Password accettata - adesso sei riconosciuto."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Password accettata - adesso sei riconosciuto."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS canale elemento"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Il nick %s non è online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND canale motivo"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND canale motivo"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick motivo"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nuovonick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "La lista SZLINE è vuota."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4893,64 +4731,120 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+durata] {mask | numero-lista} "
 "[motivo]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Salva i database e riavvia i Services"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Secure"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "L'opzione Secure founder per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "L'opzione Secure founder per %s è ora ATTIVATA."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr "L'opzione Secure ops per %s è ora ATTIVATA."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
+msgstr "L'opzione Secure ops per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
 msgstr "L'opzione Secure per %s è ora ATTIVATA."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option for %s is now on."
+msgstr "L'opzione Secure per %s è ora ATTIVATA."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
 msgstr "Opzione secure ACCESA per %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
+msgstr "Opzione secure ACCESA per %s."
+
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Sicurezza"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Invia un memo a un nick o a un canale"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF Invia un memo a tutti gli opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL Invia un memo a tutti gli utenti registrati"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Invia un messaggio a tutti gli utenti"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Invia una notifica quando vengono usati i comandi\n"
+"                     OP/DEOP"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Invia un memo e richiede una notifica di lettura"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "I servizi sono in modalità Defcon, prego riprovare più tardi."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "I servizi sono ora in DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "I Services ora sono in modalità expire."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "I Services ora sono in modalità no expire."
 
@@ -4962,7 +4856,7 @@ msgstr "I Services ora sono in modalità read-only."
 msgid "Services are now in read-write mode."
 msgstr "I Services ora sono in modalità read-write."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "I Services ora sono in modalità debug (livello %d)."
@@ -4975,7 +4869,7 @@ msgstr "I Services ora sono in modalità debug."
 msgid "Services are now in non-debug mode."
 msgstr "I Services ora non sono in modalità debug."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "I servizi sono stati configurati per non inviare e-mail."
 
@@ -4985,7 +4879,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -4994,153 +4888,190 @@ msgstr ""
 "I Services non riescono a cambiare i modi. Le U:lines dei server sono "
 "configurate correttamente?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "I Services sono up da %d giorni, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "I Services sono up da %d ore, %d minuti"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "I Services sono up da %d minuti, %d secondi"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "I servizi non opperanno più %s automaticamente nei canali."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "I servizi opperanno %s automaticamente nei canali."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "I servizi risponderanno a %s con \"messages\"."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "I servizi risponderanno a %s con \"notices\"."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Il file di configurazione dei Services' è stato ricaricato in memoria."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Il blocco dei servizi sul tuo nick è stato rilasciato."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Il limite di sessioni per %s è stato impostato a %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Il limite delle sessioni è disabilitato."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessioni:    %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessioni  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
 #, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Imposta le opzioni SET su un altro nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Imposta le opzioni e le informazioni di canale"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       Imposta il tipo di ban che sarà usato dai Services"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Imposta le opzioni relative ai memo"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Imposta le opzioni, inclusa la protezione"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Imposta la descrizione del canale"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Imposta il nome del gruppo"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Imposta il nome del tuo gruppo"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Imposta il fondatore del canale"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr "    LANGUAGE   Imposta la lingua utilizzata dai Services"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Imposta la password del nick"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Imposta il successore del fondatore del canale"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Imposta il vhost per tutti i nick di un gruppo"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Imposta il vhost di un altro utente"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Imposta varie opzioni globali dei Services"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Imposta la password del tuo nick"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Impostazione %s sconosciuta. Digita /msg %s HELP LEVELS DESC per una lista "
 "delle impostazioni valide."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr ""
 "Il parametro dell'opzione DEBUG deve essere ON, OFF, o un numero positivo."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Il parametro dell'opzione NOEXPIRE deve essere ON o OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Il parametro dell'opzione READONLY deve essere ON o OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 "L'impostazione di SuperAdmin deve essere ON o OFF (deve essere attivato in "
 "services.conf)."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "L'opzione Signed kick per %s è ora ATTIVATA."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Mostra lo stato dei Services e della rete"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      \"Firma\" i kick effettuati con il comando KICK"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5149,27 +5080,33 @@ msgstr ""
 "L'opzione Signed kick per %s è ora ATTIVATA, ma dipende dal\n"
 "livello dell'utente che utilizza il comando."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "L'opzione Signed kick per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "L'opzione Signed kick per %s è ora ATTIVATA."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Signed kick"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Spiacente, RSEND è stato disattivato su questo network."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Spiacente, l'assegnazione dei bot è temporaneamente disabilitata."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Spiacente, la creazione del bot non è andata a buon fine."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Spiacente, la modifica dei bot è temporaneamente disabilitata."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei bot è temporaneamente "
@@ -5181,7 +5118,7 @@ msgstr ""
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Spiacente, la modifica della lista AOP è temporaneamente disabilitata."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista di accesso dei canali è temporaneamente "
@@ -5192,72 +5129,47 @@ msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista autokick è temporaneamente disabilitata."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista delle parolacce è temporaneamente "
 "disabilitata."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 "Spiacente, la deregistrazione dei canali è temporaneamente disabilitata."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-"Spiacente, l'impostazione delle opzioni dei canali è temporaneamente "
-"disabilitata."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Spiacente, la registrazione dei canali è temporaneamente disabilitata."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Spiacente, impossibile cambiare la password per %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Spiacente, l'identificazione non è andata a buon fine."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Spiacente, la configurazione dei kick è temporaneamente disabilitata."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei memo è temporaneamente "
 "disabilitata."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Spiacente, l'invio dei memo è temporaneamente disabilitato."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Spiacente, la deregistrazione dei nick è temporaneamente disabilitata."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Spiacente, il raggruppamento dei nick è temporaneamente disabilitato."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-"Spiacente, l'impostazione delle opzioni dei nick è temporaneamente "
-"disabilitata."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Spiacente, la registrazione dei nick è temporaneamente disabilitata."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Spiacente, non è andata a buon fine."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5269,12 +5181,12 @@ msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 "Spiacente, puoi avere soltanto %d maschere nella lista di accesso di un nick."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Spiacente, puoi avere un massimo di %d nella lista di accesso."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Spiacente, puoi avere un massimo di %d maschere autokick."
@@ -5285,21 +5197,17 @@ msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr ""
 "Spiacente, puoi avere un massimo di %d parolacce nella lista di un canale."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Spiacente, hai già superato il limite di %d canali registrati."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Spiacente, hai già raggiunto il limite di %d canali registrati."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr ""
+"Spiacente, puoi avere soltanto %d maschere nella lista di accesso di un nick."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Le statistiche sono state azzerate."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Stato aggiornato (memos, vhost, chmodes, flags)."
 
@@ -5311,12 +5219,26 @@ msgstr "Non floodare!"
 msgid "Stop repeating yourself!"
 msgstr "Smettila di ripetere!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr ""
+"    SECUREFOUNDER Abilita un controllo più severo dello stato di\n"
+"                     fondatore"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr ""
+"    SECUREOPS     Abilita un controllo più severo dello stato di\n"
+"                     operatore"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Il successore del canale %s è stato annullato."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Il successore del canale %s ora è %s."
@@ -5325,21 +5247,36 @@ msgstr "Il successore del canale %s ora è %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "L'impostazione SuperAdmin non è abilitata in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Sospendi il nick specificato"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Simbiosi"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "La modalità symbiosis ora è ATTIVA sul canale %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "La modalità symbiosis ora è ATTIVA sul canale %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Sincronizza il vhost per tutti i nick nel gruppo"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintassi: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5367,7 +5304,7 @@ msgstr ""
 "2: ban nella forma *!*@host\n"
 "3: ban nella forma *!*user@*.dominio"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5380,7 +5317,7 @@ msgstr ""
 "Imposta la descrizione del canale, che viene mostrata\n"
 "con i comandi LIST e INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5393,7 +5330,7 @@ msgstr ""
 "Imposta il nuovo fondatore del canale. Il nick specificato\n"
 "deve essere registrato."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5412,7 +5349,7 @@ msgstr ""
 "l'ultimo utente esce dal canale, e sarà reimpostato\n"
 "la volta successiva che entra qualcuno."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5428,7 +5365,7 @@ msgstr ""
 "Quando l'opzione è attiva, %s invierà un notice al\n"
 "canale quando vengono usati i comandi OP e DEOP."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5446,7 +5383,7 @@ msgstr ""
 "(op, mezzo op, ecc.) di un utente con livello\n"
 "superiore, attraverso i comandi di %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5491,7 +5428,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5505,7 +5443,7 @@ msgstr ""
 "Quando questa opzione è attiva, il canale non sarà\n"
 "incluso nella lista restituita da /msg %s LIST."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5520,7 +5458,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5539,7 +5477,7 @@ msgstr ""
 "con %s e che si sono identificati con la loro password\n"
 "avranno l'accesso sul canale secondo le liste di accesso."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5558,7 +5496,7 @@ msgstr ""
 "il fondatore e il successore, mentre gli utenti identificati\n"
 "su %s per il canale non potranno."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5582,7 +5520,24 @@ msgstr ""
 "successore.\n"
 "Il nick specificato deve essere registrato."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintassi: %s canale TOPICLOCK {ON | OFF}\n"
+"\n"
+"Attiva o disattiva il blocco del topic per il\n"
+"canale. Quando il blocco del topic è attivo,\n"
+"%s non permetterà che il topic venga cambiato, se\n"
+"non attraverso il comando TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5626,8 +5581,8 @@ msgstr ""
 "Al contrario, passare dalle liste xOP alle liste di accesso\n"
 "non causa nessun problema."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5718,7 +5673,7 @@ msgstr ""
 "Il comando ACCESS CLEAR svuota completamente la lista di\n"
 "accesso."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5767,7 +5722,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Visualizza la lista di accesso attuale."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5779,7 +5734,7 @@ msgstr ""
 "Fa sì che il bot faccia in canale l'equivalente di un\n"
 "\"/me\" utilizzando il testo specificato."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5799,7 +5754,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5823,7 +5778,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5879,7 +5834,7 @@ msgstr ""
 "\n"
 "Il comando AKICK CLEAR svuota la lista AutoKick."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5969,7 +5924,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR svuota la lista AKILL."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6012,7 +5967,7 @@ msgstr ""
 "I canali che hanno l'opzione NOEXPIRE impostata verranno\n"
 "mostrati con un punto esclamativo."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6030,7 +5985,7 @@ msgstr ""
 "su cui nick ha livello di accesso livello o\n"
 "superiore."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6060,17 +6015,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintassi: AOP canale ADD nick\n"
 "          AOP canale DEL {nick | numero | lista}\n"
@@ -6116,7 +6060,7 @@ msgstr ""
 "maggiori informazioni, e /msg %s HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6130,8 +6074,8 @@ msgstr ""
 "indicato. Dopo averlo assegnato, il bot può essere\n"
 "configurato in base alle necessità."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6152,20 +6096,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Sintassi: BADWORDS canale ADD parola [SINGLE | START | END]\n"
 "          BADWORDS canale DEL {parola | numero | lista}\n"
@@ -6207,7 +6137,7 @@ msgstr ""
 "      \n"
 "Il comando BADWORDS CLEAR svuota la lista delle parolacce."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6224,7 +6154,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6268,7 +6198,7 @@ msgstr ""
 "il nick sarà deregistrato; inoltre, se un utente lo sta\n"
 "usando, verrà killato."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6278,7 +6208,7 @@ msgstr ""
 "\n"
 "Mostra la lista di tutti i bot disponibili."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6291,7 +6221,21 @@ msgstr ""
 "sempre che non sia già stato letto prima dell'uso di questo\n"
 "comando."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6303,7 +6247,7 @@ msgstr ""
 "Utilizza l'intero e completo ident@host per ogni nick,\n"
 "in seguito imposta l'AKILL. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6325,7 +6269,7 @@ msgstr ""
 "Se viene indicato SECRET, mostra solo i canali che corrisponodno a\n"
 "pattern e che hanno il modo di canale +s o +p attivo."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6337,7 +6281,7 @@ msgstr ""
 "Controlla se l'_ultimo_ memo che hai inviato al nick è stato letto\n"
 "oppure no. Nota che questo funziona unicamente coi nick, non coi canali."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6354,7 +6298,7 @@ msgstr ""
 "Il comando è limitato agli utenti che hanno accesso di\n"
 "fondatore."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6364,16 +6308,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6390,7 +6347,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6402,7 +6359,7 @@ msgstr ""
 "di restrizioni dei servizi predefinite, utili durante un tentativo\n"
 "d'attacco sul network."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6425,7 +6382,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai HOP o agli\n"
 "utenti con livello 4 o superiori per il dehalfop su se stessi."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6434,7 +6391,7 @@ msgstr ""
 "Sintassi: DEL <nick>\n"
 "Elimina dal database il vhost assegnato al nick specificato."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6472,7 +6429,7 @@ msgstr ""
 "      Elimina i memo che hanno numero numeri tra 2 e 5 e\n"
 "      tra 7 e 9, conservando quindi il 6."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6483,7 +6440,7 @@ msgstr ""
 "Rimuove il vhost da tutti i nick dello stesso gruppo del nick\n"
 "specificato."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6504,7 +6461,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti\n"
 "con livello di accesso 5 o superiori."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6524,7 +6481,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti\n"
 "con livello di accesso 5 o superiori."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6545,7 +6502,7 @@ msgstr ""
 "oppure ai SOP o agli utenti con livello 10 o superiori per\n"
 "la rimozione della protezione su se stessi."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6568,7 +6525,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai VOP o agli\n"
 "utenti con livello 3 o superiori per il devoice su se stessi."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6580,7 +6537,7 @@ msgstr ""
 "Deregistra il canale specificato. Può essere usato soltanto\n"
 "da un fondatore di canale."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6593,8 +6550,8 @@ msgstr ""
 "possono deregistrare un canale per il quale non si siano\n"
 "identificati."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6625,7 +6582,7 @@ msgstr ""
 "password (digita /msg %s HELP IDENTIFY per avere maggiori\n"
 "informazioni)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6649,7 +6606,7 @@ msgstr ""
 "La deregistrazione di qualsiasi nick è limitata ai\n"
 "Services Operator."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6734,7 +6691,7 @@ msgstr ""
 "grandi ed mask generiche possono degradare la funzionalità dei\n"
 "Services."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6751,7 +6708,7 @@ msgstr ""
 "\n"
 "Il motivo potrebbe essere richiesto su alcune reti."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6768,7 +6725,7 @@ msgstr ""
 "\n"
 "Su alcune reti può essere necessario specificare il motivo."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6781,7 +6738,7 @@ msgstr ""
 "non puoi usare \"wildcards\" (*) né per user, né per emailhost.\n"
 "Questo comando viene loggato."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6791,7 +6748,7 @@ msgstr ""
 "\n"
 "Restituisce la chiave (password) del canale specificato."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6812,7 +6769,7 @@ msgstr ""
 "Questo comando non è disponibile quando è attiva la\n"
 "criptazione dei database."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6844,7 +6801,7 @@ msgstr ""
 "nello stesso gruppo di quel nick, o devi fornire la password\n"
 "corretta per quel nick."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6854,7 +6811,7 @@ msgstr ""
 "\n"
 "Mostra tutti i nick del tuo gruppo."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6887,7 +6844,7 @@ msgstr ""
 "gli utenti della rete. Il messaggio sarà inviato\n"
 "dal nick %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6900,7 +6857,8 @@ msgstr ""
 "Questo comando permette agli utenti di impostare il vhost del\n"
 "loro nick ATTUALE come vhost di tutti i nick nello stesso gruppo."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6962,7 +6920,7 @@ msgstr ""
 "\n"
 "Nota: tutti i nick di un gruppo hanno la stessa password."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6984,7 +6942,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai HOP o agli\n"
 "utenti con livello 4 o superiori per l'halfop su se stessi."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7013,16 +6971,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintassi: HOP channel ADD nick\n"
 "          HOP channel DEL {nick | numero | lista}\n"
@@ -7064,7 +7012,7 @@ msgstr ""
 "maggiori informazioni, e /msg %s HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7083,7 +7031,7 @@ msgstr ""
 "deve essere la stessa che è stata utilizzata con il\n"
 "comando REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7093,7 +7041,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7126,7 +7074,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7148,7 +7096,7 @@ msgstr ""
 "Di default, l'opzione ALL è limitata a coloro che hanno\n"
 "l'accesso come fondatore sul canale."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7166,7 +7114,7 @@ msgstr ""
 "ALL, vedrai tutte le informazioni, che siano nascoste\n"
 "o meno."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7182,7 +7130,7 @@ msgstr ""
 "in totale. Se viene specificato un canale, mostra le stesse\n"
 "informazioni, ma relative al canale indicato."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7207,7 +7155,7 @@ msgstr ""
 "le stesse informazioni ma relative al nick.\n"
 "Questo modo d'uso è limitato ai Services Operator."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7227,7 +7175,7 @@ msgstr ""
 "relative alla data di creazione e al numero di canali\n"
 "a cui è assegnato."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7269,7 +7217,7 @@ msgstr ""
 "\"Juped by <nick>\", indicando il nick della persona che ha\n"
 "bloccato il server."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7285,7 +7233,8 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7312,7 +7261,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7334,8 +7283,8 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7400,7 +7349,7 @@ msgstr ""
 "\n"
 "*** Spammer has been kicked off channel #canale by %s (OperNick (motivo))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7418,7 +7367,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7435,7 +7384,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7464,7 +7413,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7481,7 +7430,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7505,7 +7454,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7521,7 +7470,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7538,7 +7487,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7555,7 +7504,7 @@ msgstr ""
 "essere kickato prima di venire bannato. Se il parametro\n"
 "non è specificato, l'utente non verrà bannato."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7608,7 +7557,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7632,7 +7581,7 @@ msgstr ""
 "L'elenco utilizza il valore di NSListMax come limite per\n"
 "il numero di elementi da mostrare ad un operatore alla volta."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7647,7 +7596,7 @@ msgstr ""
 "pattern specificato. I canali con l'opzione PRIVATE\n"
 "attiva non saranno mostrati."
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7689,7 +7638,7 @@ msgstr ""
 "        Mostra tutti i nick registrati da utenti del dominio\n"
 "        bar.org."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7750,7 +7699,7 @@ msgstr ""
 "        Mostra tutti i nick registrati che non\n"
 "        scadono."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7773,11 +7722,21 @@ msgstr ""
 "      Mostra i memo che hanno numeri tra 2 e 5 e tra 7 e 9,\n"
 "      escludendo quindi il 6."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Sintassi: LOGONNEWS ADD testo"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7810,7 +7769,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Sintassi: LOGONNEWS DEL {numero | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7826,7 +7785,7 @@ msgstr ""
 "del nick. Tieni presente, però, che non dovrai identificarti\n"
 "di nuovo."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7851,22 +7810,7 @@ msgstr ""
 "chiederanno al nick specificato di reidentificarsi. Questo\n"
 "modo di utilizzo è limitato ai Services Operator."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintassi: MODE canale modi\n"
-"\n"
-"Permette ai Services operator di impostare modi di canale\n"
-"per qualsiasi canale. I parametri sono gli stessi utilizzati\n"
-"con il comando /MODE standard."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7893,7 +7837,22 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Sintassi: MODE canale modi\n"
+"\n"
+"Permette ai Services operator di impostare modi di canale\n"
+"per qualsiasi canale. I parametri sono gli stessi utilizzati\n"
+"con il comando /MODE standard."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7902,7 +7861,7 @@ msgstr ""
 "Sintassi: MODINFO NomeFile\n"
 "Questo comando elenca informazioni sul modulo caricato specificato"
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7911,7 +7870,7 @@ msgstr ""
 "Sintassi: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Elenca tutti i moduli attualmente caricati."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7922,7 +7881,7 @@ msgstr ""
 "Questo comando carica il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7933,7 +7892,7 @@ msgstr ""
 "Questo comando carica il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7944,7 +7903,7 @@ msgstr ""
 "Questo comando rimuove il modulo chiamato NomeFile dalla cartella\n"
 "modules."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7973,7 +7932,7 @@ msgstr ""
 "Nota: il formato del server specificato non è controllato\n"
 "dai Services prima dell'esecuzione del comando."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7985,7 +7944,7 @@ msgstr ""
 "Quando usi questo comando, ogni utente che effettua un /whois\n"
 "su di te vedrà il tuo vero indirizzo IP."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8000,7 +7959,7 @@ msgstr ""
 "da \"+\" o \"-\". Per rimuovere tutte le flag, è sufficiente\n"
 "usare \"-\" senza altri parametri."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8013,7 +7972,7 @@ msgstr ""
 "Quando usi questo comando, ogni utente che effettua un\n"
 "/whois su di te vedrà il vhost invece del tuo vero indirizzo IP."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8038,7 +7997,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Sintassi: OPERNEWS ADD testo"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8071,7 +8030,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Sintassi: OPERNEWS DEL {numero | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8091,7 +8050,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti\n"
 "con livello di accesso 5 o superiori."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8113,7 +8072,7 @@ msgstr ""
 "oppure ai SOP o agli utenti con livello 10 o superiori per\n"
 "la protezione su se stessi."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8142,16 +8101,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8190,7 +8139,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8214,7 +8163,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Sintassi: RANDOMNEWS ADD testo"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8241,7 +8190,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Sintassi: RANDOMNEWS DEL {numero | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8267,7 +8216,8 @@ msgstr ""
 "      Mostra i memo che hanno numeri tra 2 e 5 e tra 7 e 9,\n"
 "      escludendo quindi il 6."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8315,8 +8265,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8358,8 +8308,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8427,7 +8377,7 @@ msgstr ""
 "privilegi sui canali. Per maggiori informazioni su questo\n"
 "servizio, digita /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8456,7 +8406,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8472,7 +8422,7 @@ msgstr ""
 "il cambio dei nick dei Services, l'attivazione della\n"
 "limitazione delle sessioni, eccetera)."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8484,7 +8434,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8506,7 +8456,7 @@ msgstr ""
 "\n"
 "Salva i database su disco e riavvia i Services."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8529,7 +8479,7 @@ msgstr ""
 "una notifica automatica al mittente, informandolo che il suo memo\n"
 "è stato letto."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8541,7 +8491,7 @@ msgstr ""
 "Imposta varie opzioni del nick. opzione può essere una delle\n"
 "seguenti:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8556,7 +8506,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8568,7 +8518,7 @@ msgstr ""
 "Imposta il nome con cui i Services si riferiscono al tuo\n"
 "gruppo. Il nuovo nome DEVE essere un nick del gruppo."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8578,7 +8528,7 @@ msgstr ""
 "\n"
 "Associa l'indirizzo e-mail specificato al nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8594,7 +8544,7 @@ msgstr ""
 "l'opzione GREET attiva, se si ha un livello di accesso\n"
 "al canale sufficiente."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8616,7 +8566,7 @@ msgstr ""
 "specifica se l'informazione indicata debba essere\n"
 "mostrata (OFF) o nascosta (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8648,24 +8598,7 @@ msgstr ""
 "opzione se non è strettamente necessario. L'opzione IMMED,\n"
 "inoltre, potrebbe non essere disponibile."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8679,7 +8612,7 @@ msgstr ""
 "col nick. Se MSG è attivo, i Services usano i messaggi (query),\n"
 "altrimenti usano i notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8691,7 +8624,7 @@ msgstr ""
 "Imposta se il nickname specificato scadrà.  Impostandolo su\n"
 "ON eviterà che il nickname scada."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8703,7 +8636,7 @@ msgstr ""
 "Cambia la password utilizzata per identificarsi come\n"
 "proprietario del nick."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8722,7 +8655,7 @@ msgstr ""
 "chiunque sappia il nick può leggerne le informazioni con il\n"
 "comando INFO."
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8744,7 +8677,7 @@ msgstr ""
 "accesso, %s non cambierà il suo nick, anche se l'opzione KILL\n"
 "è attiva."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8754,7 +8687,7 @@ msgstr ""
 "\n"
 "Fa sì che il bot dica in canale il testo specificato."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8772,7 +8705,7 @@ msgstr ""
 "che ha un nuovo memo. Il nick/canale di destinazione deve\n"
 "esser registrato."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8782,7 +8715,7 @@ msgstr ""
 "Sintassi: SENDALL testo-memo\n"
 "Invia un memo contenente testo-memo a tutti gli utenti registrati."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8800,7 +8733,7 @@ msgstr ""
 "\n"
 "Potrebbe essere disponibile soltanto per gli IrcOp."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8834,7 +8767,7 @@ msgstr ""
 "sulla limitazione delle sessioni e come configurare limiti specifici\n"
 "per determinati host o gruppi di host."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8848,7 +8781,7 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> permette di impostare l'ident,\n"
 "oltre che il vhost."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8864,8 +8797,8 @@ msgstr ""
 "lista di accesso non potranno avere lo stato di operatore\n"
 "di canale."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8890,26 +8823,9 @@ msgstr ""
 "è uguale o maggiore al livello SIGNKICK del canale.\n"
 "Per maggiori informazioni, digita /msg %s HELP LEVELS."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintassi: %s canale TOPICLOCK {ON | OFF}\n"
-"\n"
-"Attiva o disattiva il blocco del topic per il\n"
-"canale. Quando il blocco del topic è attivo,\n"
-"%s non permetterà che il topic venga cambiato, se\n"
-"non attraverso il comando TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8943,7 +8859,7 @@ msgstr ""
 "Nota: l'accesso a questo comando dipende dall'impostazione\n"
 "del livello SET."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8954,7 +8870,7 @@ msgstr ""
 "Questa opzione fa sì che il bot sia assegnabile\n"
 "soltanto dagli IrcOp."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8970,7 +8886,7 @@ msgstr ""
 "\n"
 "Opzioni disponibili:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8985,7 +8901,7 @@ msgstr ""
 "kickati dal bot, anche se non hanno accesso di\n"
 "livello NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9000,7 +8916,7 @@ msgstr ""
 "kickati dal bot, anche se non hanno accesso di\n"
 "livello NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9033,7 +8949,7 @@ msgstr ""
 "(ad esempio, per usare !op, l'utente deve avere\n"
 "privilegi sufficienti anche per il livello OPDEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9050,7 +8966,7 @@ msgstr ""
 "sufficienti. Per impostare il messaggio di saluto,\n"
 "è necessario usare l'opzione SET GREET di NickServ."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9065,7 +8981,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9080,7 +8996,7 @@ msgstr ""
 "Se un bot è già assegnato, verrà rimosso nel\n"
 "momento in cui viene attivata l'opzione."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9092,7 +9008,7 @@ msgstr ""
 "Imposta se il canale scadrà o meno in caso di inutilizzo. Se\n"
 "l'opzione è impostata a ON, il canale non scadrà."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9111,8 +9027,8 @@ msgstr ""
 "la visualizzazione del messaggio di ingresso,\n"
 "eccetera."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9139,7 +9055,7 @@ msgstr ""
 "Digita /msg %s HELP SET opzione per ottenere\n"
 "maggiori informazioni su un'opzione specifica."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9150,7 +9066,7 @@ msgstr ""
 "Imposta varie opzioni del nick. opzione può essere una delle\n"
 "seguenti:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9174,7 +9090,7 @@ msgstr ""
 "    IGNORE     Attiva o disattiva la modalità ignore\n"
 "    LIST       Elenca le opzioni"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9186,7 +9102,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9198,7 +9114,7 @@ msgstr ""
 "Imposta il nome con cui i Services si riferiscono al tuo\n"
 "gruppo. Il nuovo nome DEVE essere un nick del gruppo."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9212,7 +9128,7 @@ msgstr ""
 "Questo indirizzo sarà mostrato quando qualcuno richiede\n"
 "informazioni sul proprio nick con il comando INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9228,7 +9144,7 @@ msgstr ""
 "l'opzione GREET attiva, se si ha un livello di accesso\n"
 "al canale sufficiente."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9250,7 +9166,7 @@ msgstr ""
 "parametro specifica se l'informazione indicata debba essere\n"
 "mostrata (OFF) o nascosta (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9282,7 +9198,7 @@ msgstr ""
 "opzione se non è strettamente necessario. L'opzione IMMED,\n"
 "inoltre, potrebbe non essere disponibile."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9300,7 +9216,7 @@ msgstr ""
 "numero deve essere scelto dalla lista seguente, che\n"
 "elenca le lingue supportate:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9318,7 +9234,7 @@ msgstr ""
 "non è possibile impostare il limite a un valore maggiore\n"
 "di %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9361,7 +9277,7 @@ msgstr ""
 "privilegi, e potrebbero non essere in grado di rimuovere\n"
 "il limite o di impostarlo a un valore maggiore di %d."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9370,7 +9286,7 @@ msgstr ""
 "Sintassi: SET LIST\n"
 "Mostra le varie impostazioni di %s"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9384,7 +9300,7 @@ msgstr ""
 "con te. Se MSG è attivo, i Services usano i messaggi (query),\n"
 "altrimenti usano i notices."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9403,7 +9319,7 @@ msgstr ""
 "Questa opzione è equivalente all'opzione di riga di comando\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9442,7 +9358,7 @@ msgstr ""
 "\n"
 "ON è sostanzialmente la combinazione di LOGON e NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9454,7 +9370,7 @@ msgstr ""
 "Cambia la password utilizzata per identificarti come\n"
 "proprietario del nick."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9473,7 +9389,7 @@ msgstr ""
 "chiunque sappia il tuo nick può leggerne le informazioni con il\n"
 "comando INFO."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9505,7 +9421,7 @@ msgstr ""
 "Questa opzione è equivalente all'opzione di riga di comando\n"
 "-readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9527,7 +9443,7 @@ msgstr ""
 "accesso, %s non cambierà il tuo nick, anche se l'opzione KILL\n"
 "è attiva."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9543,7 +9459,7 @@ msgstr ""
 "Questa opzione NON è persistente, e dovrebbe essere usata\n"
 "solo quando necessario, e reimpostata a OFF al più presto."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9564,7 +9480,7 @@ msgstr ""
 "NOTA - questo comando non aggiornerà i vhost dei nick\n"
 "aggiunti successivamente al gruppo."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9574,7 +9490,7 @@ msgstr ""
 "\n"
 "Salva i database su disco e termina i Services."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9666,7 +9582,7 @@ msgstr ""
 "\n"
 "SNLINE CLEAR svuota la lista SNLINE."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9696,16 +9612,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintassi: SOP canale ADD nick\n"
 "          SOP canale DEL {nick | numero | lista}\n"
@@ -9749,7 +9655,7 @@ msgstr ""
 "maggiori informazioni, e /msg %s HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9844,7 +9750,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR svuota la lista SQLINE."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9854,7 +9760,7 @@ msgstr ""
 "Mostra tutti i nick dello staff dei services coi rispettivi\n"
 "livelli e stato on-line."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9864,7 +9770,7 @@ msgstr ""
 "Sintassi: STAFF testo-memo\n"
 "Invia un memo contenenteo testo-memo a tutto lo services staff."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9908,7 +9814,7 @@ msgstr ""
 "registrato al numero degli utenti connessi attualmente\n"
 "alla rete."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9932,7 +9838,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR messaggio-di-errore"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9978,7 +9884,7 @@ msgstr ""
 "resto sarà ignorato. Se nessun nickname è specificato verrà indicato\n"
 "lo stato del tuo nick."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9996,7 +9902,7 @@ msgstr ""
 "\n"
 "Il motivo potrebbe essere richiesto su alcune reti."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10006,7 +9912,7 @@ msgstr ""
 "\n"
 "Forza il cambio del nickname di un utente da nick a newnick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10095,7 +10001,8 @@ msgstr ""
 "\n"
 "SZLINE CLEAR svuota la lista SZLINE."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10119,21 +10026,7 @@ msgstr ""
 "Di default, il comando è limitato agli utenti con\n"
 "accesso di fondatore sul canale."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintassi: UMODE nick modi\n"
-"\n"
-"Permette ai Services Operators di impostare i modi per\n"
-"qualsiasi utente. I parametri sono gli stessi del\n"
-"comando /MODE standard."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10151,7 +10044,7 @@ msgstr ""
 "riconfigurare tutto di nuovo nel caso se ne assegni\n"
 "uno di nuovo."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10170,7 +10063,7 @@ msgstr ""
 "Di default, il comando è limitato agli AOP o agli utenti con\n"
 "livello di accesso 5 o superiori sul canale."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10187,7 +10080,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10199,7 +10092,7 @@ msgstr ""
 "Rilascia un canale sospeso. Tutti i dati e le impostazioni\n"
 "sono preservate da prima della sospensione."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10212,7 +10105,7 @@ msgstr ""
 "Services nello stesso istante in cui il comando viene\n"
 "inviato."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10236,7 +10129,7 @@ msgstr ""
 "Se viene indicato INVISIBLE, mostra solo gli utenti con il modo\n"
 "utente +i attivo."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10259,7 +10152,7 @@ msgstr ""
 "con livello di accesso 5 o superiori, oppure ai VOP o agli\n"
 "utenti con livello 3 o superiori per il voice su se stessi."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10288,16 +10181,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintassi: VOP canale ADD nick\n"
 "          VOP canale DEL {nick | numero | lista}\n"
@@ -10340,7 +10223,7 @@ msgstr ""
 "maggiori informazioni, e /msg %s HELP SET XOP\n"
 "per scoprire come passare da un sistema all'altro."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10356,7 +10239,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10364,7 +10247,7 @@ msgstr ""
 "Sintassi: SUSPEND nickname motivo\n"
 "Impedisce al nickname di venire utilizzato."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10372,7 +10255,7 @@ msgstr ""
 "Sintassi: UNSUSPEND nickname\n"
 "Rilascia il nickname sospeso."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10384,51 +10267,94 @@ msgstr ""
 "imposta i chanmode necessari (ModeonID) e aggiorna il tuo vhost e\n"
 "i tuoi userflags (lastseentime, ecc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canale [topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Annulla varie impostazioni del canale"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr "    NOOP        Rimuove temporaneamente tutte le O:line di un server"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Termina i Services salvando i database"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Termina i Services senza salvare i database"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "L'opzione IMMED non è disponibile su questa rete."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "La lista AKILL è stata svuotata."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Il livello Defcon è ora: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "L'indirizzo e-mail di %s verrà ora nascosto da %s INFO."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "L'indirizzo e-mail di %s verrà ora mostrato in %s INFO."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "La lista SNLINE è stata svuotata."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "La lista SQLINE è stata annullata."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "La lista SZLINE è stata svuotata."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Il canale %s non ha una key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10440,86 +10366,76 @@ msgstr ""
 "livelli massimi per i quali la funzione sarà attiva,\n"
 "mentre tutti gli altri sono livelli minimi."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "L'host %s ha %d sessioni, con un limite di %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "L'ultimo memo che hai inviato a %s (inviato il %s) è stato letto."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "L'ultimo memo che hai inviato a %s (inviato il %s) non è stato ancora letto."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "L'ultimo messaggio di quit di %s verrà ora nascosto da %s INFO."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "L'ultimo messaggio di quit di %s verrà ora mostrato in %s INFO."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr "L'ultima mask user@host vista di %s verrà ora nascosta da %s INFO."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr "L'ultima mask user@host vista di %s verrà ora mostrata in %s INFO."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Il limite dei memo di %s non può essere modificato."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "Il nuovo display per %s DEVE essere un nickname del gruppo nickname!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Il nuovo display adesso è %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Il nick %s viene ora cambiato in %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr "Lo stato di accesso ai servizi di %s verrà ora nascosto da %s INFO."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr "Lo stato di accesso ai servizi di %s verrà ora mostrato in %s INFO."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Ci sono %d memo sul canale %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10527,7 +10443,8 @@ msgstr ""
 "Non ci sono bot disponibili in questo momento.\n"
 "Chiedi a un Services Operator di crearne uno!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10537,20 +10454,12 @@ msgstr ""
 "alcuni. Digita /msg %s HELP GLIST e /msg %s HELP DROP \n"
 "per avere altre informazioni."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "C'è %d memo sul canale %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"C'è un nuovo memo sul canale %s.\n"
-"Digita /msg %s READ %s %d per leggerlo."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Non c'è più nessun bot assegnato a %s."
@@ -10571,7 +10480,7 @@ msgstr "Non c'è nessuna Random News."
 msgid "There's no email address set for your nick."
 msgstr "Non c'è un indirizzo email impostato per il tuo nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10587,83 +10496,38 @@ msgstr ""
 "    PRIVATE          Fa in modo che il bot sia assegnabile\n"
 "                        solo dagli IrcOp"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Questo canale è stato vietato."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Questo canale è stato registrato con %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Questo canale è stato sospeso."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Questo canale non può essere usato."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Questo canale non scadrà."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Questo nick è già stato richiesto. Per favore, controlla la tua casella di "
-"posta; dovresti aver ricevuto il codice di attivazione."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Questo nick è in attesa di un codice di attivazione via e-mail per "
-"completare la registrazione."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Questo nick appartiene a qualcun altro. Per favore scegline un altro.\n"
-"(Se questo è il tuo nick, digita /msg %s IDENTIFY password.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Questo nick è stato registrato; non puoi usarlo."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Questo nickname è momentaneamente sospeso"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Questo nickname è momentaneamente sospeso, motivo: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Questo nick è registrato e protetto. Se questo è il tuo\n"
-"nick, digita /msg %s IDENTIFY password. Altrimenti,\n"
-"scegli un nick diverso."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Questo nick non scadrà."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Questo nick non può essere usato. Per favore scegline un altro."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Questo nick non scadrà."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10671,30 +10535,62 @@ msgstr ""
 "Per cercare canali che cominciano con #, cerca il nome del canale\n"
 "senza il segno # (anope invece di #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Seleziona il sistema di privilegi utilizzato"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Blocco del topic"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Mantenimento del topic"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr ""
+"    TOPICLOCK     Imposta il blocco del topic (modificabile solo\n"
+"                     attraverso il comando TOPIC)"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Il blocco del topic per %s è ora ATTIVATO."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic lock option for %s is now on."
+msgstr "Il blocco del topic per %s è ora ATTIVATO."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "La memorizzazione del topic per %s è ora ATTIVATA."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "La memorizzazione del topic per %s è ora ATTIVATA."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Disattiva il caps lock!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Attiva o disattiva la sicurezza"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Attiva o disattiva la protezione"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10710,7 +10606,8 @@ msgstr ""
 "    minimo può essere impostato con il comando LEVELS di\n"
 "    %s."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10720,7 +10617,8 @@ msgstr ""
 "su un'opzione specifica. Le opzioni verranno impostate sul\n"
 "nickname specificato."
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10728,7 +10626,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10736,130 +10635,131 @@ msgstr ""
 "Digita /msg %s HELP option per ottenere maggiori\n"
 "informazioni su un comando specifico."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Digita /msg %s SET EMAIL e-mail per inserire la tua e-mail.\n"
-"La tua privacy è rispettata; questa e-mail non sarà data a\n"
-"terzi."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Digita /msg %s LIST NEW per ottenerne la lista."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Digita /msg %s READ %d per leggerlo."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Digita /msg %s READ LAST per leggerlo."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modi"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Digita /msg %s SET EMAIL e-mail per inserire la tua e-mail.\n"
+"La tua privacy è rispettata; questa e-mail non sarà data a\n"
+"terzi."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canale"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canale [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canale"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Rimuovi un modulo"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossibile caricare il modulo %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossibile rimuovere il modulo %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN     Rimuove il bot da un canale"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Opzione SASET %s sconosciuta."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Opzione SET %s sconosciuta."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opzione %s di STATS sconosciuta."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Comando sconosciuto %s.  \"/msg %s HELP\" per l'aiuto."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "%c è stato ignorato perché è un modo di canale sconosciuto."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opzione %s sconosciuta."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Rilascia il nick specificato"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Opzione %s sconosciuta.\n"
-"Digita /msg %s HELP SET per maggiori informazioni."
+"    UPDATE     Aggiorna il tuo stato attuale, ovvero controlla eventuali "
+"nuovi memo"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Aggiornamento dei database."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Utenti:      %6d records, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"L'utente che usava il tuo nick è stato disconnesso.\n"
-"Digita /msg %s RELEASE %s per usarlo prima che termini il blocco di %s."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "L'utente corrisponde a una delle eccezioni del canale."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10867,16 +10767,35 @@ msgstr ""
 "Lista dei nick:\n"
 "Nick                 Mask"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Il fondatore del canale %s ora è %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Mostra la lista delle sessioni degli host"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Assegna lo stato di voice a un utente (+v)"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Protezione per i voice"
 
@@ -10902,16 +10821,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Occhio a come parli!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Sei già un membro del gruppo di %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Sei già identificato."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "Sei già in %s! "
@@ -10920,11 +10839,7 @@ msgstr "Sei già in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Non sei più un SuperAdmin."
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Non hai il permesso di stare su questo canale."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Non puoi modificare limite dei tuoi memo."
 
@@ -10932,11 +10847,12 @@ msgstr "Non puoi modificare limite dei tuoi memo."
 msgid "You are now a SuperAdmin"
 msgstr "Ora sei un SuperAdmin."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Ora sei un IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10944,41 +10860,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Adesso sei nel gruppo di %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "Non puoi richiedere una ricevuta se mandi un memo a te stesso."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Non puoi disconnettere te stesso!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Impossibile deidentificare %s perchè è un Services Operator."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Non puoi recuperare te stesso!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10987,7 +10904,8 @@ msgstr ""
 "Questo comando non è utilizzabile; usa i comandi SOP, AOP, HOP e VOP.\n"
 "Digita /msg %s HELP comando per ottenere maggiori informazioni."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10998,6 +10916,7 @@ msgstr ""
 "Digita /msg %s HELP comando per maggiori informazioni."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11005,58 +10924,68 @@ msgstr ""
 "Questo comando non è utilizzabile; usa il comando ACCESS.\n"
 "Digita /msg %s HELP ACCESS per avere maggiori informazioni."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr ""
 "Non puoi impostare il limite dei memo di %s ad un valore superiore a %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr ""
 "Non puoi impostare il limite dei tuoi memo ad un valore superiore a %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Non puoi annullare l'impostazione dell'e-mail."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Hai %d memo, di cui %d non sono stati ancora letti."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Hai %d memo, di cui 1 non è stato ancora letto."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Hai %d memo."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Hai %d memo, nessuno dei quali è stato letto."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Hai 1 memo, e non l'hai ancora letto."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Hai 1 memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Non hai alcun memo."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11066,63 +10995,44 @@ msgstr "Hai %d nuovi memo."
 msgid "You have 1 new memo."
 msgstr "Hai un nuovo memo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Hai ricevuto un nuovo memo da %s.\n"
-"Digita /msg %s READ %d per leggerlo."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Sei stato invitato in %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "I ban che ti riguardavano sono stati rimossi da %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Non c'è alcun limite al numero di memo che puoi conservare."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Non hai nuovi memo."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Non hai nuovi memo."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Devi inserire un numero valido per indicare il tempo."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Devi assegnare un bot al canale prima di usare questo comando.\n"
-"Digita /msg %s HELP ASSIGN per maggiori informazioni."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Devi essere operatore di canale (+o) per registrare il canale."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Devi essere operatore di canale (+o) per registrare il canale."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Devi essere connesso per almeno %d secondi per poter registrare il tuo nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11132,23 +11042,23 @@ msgstr ""
 "Questa e-mail ti permetterà di recuperare la tua password\n"
 "nel caso tu la dimentichi."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr "Sarai informato dei nuovi memo quando ti connetti e quando li ricevi."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Sarai informato dei nuovi memo quando ti connetti."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Sarai informato dei nuovi memo quando li ricevi."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Non potrai più ricevere memo."
 
@@ -11156,7 +11066,7 @@ msgstr "Non potrai più ricevere memo."
 msgid "You will no longer be informed via email."
 msgstr "Non verrai più informato via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Non sarai informato dei nuovi memo."
 
@@ -11164,18 +11074,20 @@ msgstr "Non sarai informato dei nuovi memo."
 msgid "You will now be informed about new memos via email."
 msgstr "Verrai ora informato su nuovi memo via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Il tuo IRCD non supporta i vIdent; se li supporta, invia un messaggio al "
-"team di sviluppo dei Services indicandolo come possibile bug."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "La tua lista d'accesso è vuota."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Sei già identificato."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11191,35 +11103,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "La tua lista d'accesso è vuota."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "Indirizzo e-mail per %s cambiato in %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Tutte le O:lines di %s sono state rimosse."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "La lista ignore è vuota."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Il limite dei tuoi memo è stato disabilitato."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Il limite dei tuoi memo è stato impostato a %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Il limite dei tuoi memo è %d, e non può essere modificato."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Il limite dei tuoi memo è %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Il limite dei tuoi memo è 0; non riceverai alcun nuovo memo."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11227,61 +11160,57 @@ msgstr ""
 "Il limite dei tuoi memo è 0; non riceverai alcun nuovo memo. Non puoi "
 "modificare questo limite."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Non sei più identificato per il tuo nick."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Il tuo nick è già registrato; digita prima /msg %s DROP."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Il tuo nick non è registrato."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Il tuo nick è stato deregistrato."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Il tuo nick sarà cambiato a %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Il codice di attivazione è stato reinviato a %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La tua password è %s - non dimenticarla!"
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "La tua password è troppo lunga. Riprova con una password piu corta."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Il tuo vhost (%s) ora è attivato."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Il tuo vhost (%s@%s) ora è attivato."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11300,94 +11229,95 @@ msgstr "[Messaggio per gli operatori - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Messaggio del giorno - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "non scade"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "scade con il prossimo aggiornamento dei database"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "scade tra %d giorno"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "scade tra %d giorni"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "scade tra %d ora, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "scade tra %d ora, %d minuti"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "scade tra %d ore, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "scade tra %d ore, %d minuti"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "scade tra %d minuto"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "scade tra %d minuti"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Il vhost di %s è stato rimosso."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Il vhost per %s è stato impostato a %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Il vhost per %s è stato impostato a %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Il vhost per il gruppo di %s è stato impostato a %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Il vhost per il gruppo di %s è stato impostato a %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "i vhost per il gruppo %s sono stati rimossi."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Liste xOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now off."
+msgstr "Il sistema di liste xOP per %s è ora ATTIVATO."
+
+#: modules/core/cs_set_xop.cpp:71
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now on."
 msgstr "Il sistema di liste xOP per %s è ora ATTIVATO."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "Il sistema xOP non è disponibile."
 
@@ -11396,564 +11326,3 @@ msgstr "Il sistema xOP non è disponibile."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canale} testo-del-memo"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s aggiunto alla lista AOP di %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s aggiunto alla lista HOP di %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s aggiunto alla lista SOP di %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s aggiunto alla lista VOP di %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s eliminato dalla lista HOP di %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s eliminato dalla lista SOP di %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s eliminato dalla lista VOP di %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s spostato alla lista HOP di %s."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s spostato alla lista SOP di %s."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s spostato alla lista VOP di %s."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s non trovato nella lista HOP di %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s non trovato nella lista SOP di %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s non trovato nella lista VOP di %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr "    PRIVATE    Nasconde il nick dalla lista (/msg %s LIST)"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d giorni"
-
-#~ msgid "%d hours"
-#~ msgstr "%d ore"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minuti"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d secondi"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "La lista HOP di %s è vuota."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "La lista SOP di %s è vuota."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "La lista VOP di %s è vuota."
-
-#~ msgid "1 day"
-#~ msgstr "1 giorno"
-
-#~ msgid "1 hour"
-#~ msgstr "1 ora"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
-
-#~ msgid "1 second"
-#~ msgstr "1 secondo"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Permette l'uso del comando CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Permette l'uso dei comandi HALFOP e DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "La lista HOP del canale %s è stata svuotata."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "La lista SOP del canale %s è stata svuotata."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "La lista VOP del canale %s è stata svuotata."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "Eliminati %d record dalla lista HOP di %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "Eliminati %d record dalla lista SOP di %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "Eliminati %d record dalla lista VOP di %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "Eliminato un record dalla lista HOP di %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "Eliminato un record dalla lista SOP di %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "Eliminato un record dalla lista VOP di %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Impostazione dell'indirizzo e-mail annullata."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP canale {ADD|DEL|LIST|CLEAR} [nick | numero-lista]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Fine della lista dei nick."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Il messaggio di ingresso di %s è stato annullato."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Il bot non è sul canale %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "Messaggio di ingresso: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "La lista d'accesso per %s è vuota."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Lista di accesso di %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Il messaggio di ingresso di %s è stato cambiato."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "La modalità fantasy ora è DISATTIVA sul canale %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "La modalità greet (saluto) ora è DISATTIVA sul canale %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista HOP di %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Errore interno - Impossibile elaborare la richiesta."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "La Logon News numero %d è stata eliminata."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s non registrato."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Registrazione del nick (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Password del nick (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Nessun # trovato davanti al nome del canale."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "La modalità No Bot ora è DISATTIVA sul canale %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Nessun record corrispondente nella lista HOP di %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Nessun record corrispondente nella lista SOP di %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Nessun record corrispondente nella lista VOP di %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Il record specificato (%d) non è presente nella lista AOP di %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Il record specificato (%d) non è presente nella lista HOP di %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Il record specificato (%d) non è presente nella lista SOP di %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Il record specificato (%d) non è presente nella lista VOP di %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "L'opzione Op-notice per %s è ora DISATTIVATA."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "L'opzione Peace per %s è ora DISATTIVATA."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr "Attendi %d secondi prima di usare di nuovo il comando SEND."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "La modalità Private del bot %s ora è DISATTIVA."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "L'opzione Private per %s è ora DISATTIVATA."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Opzione private SPENTA per %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protezione SPENTA per %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "La protezione ora è ATTIVA, senza ritardo."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER password [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "L'opzione Restricted access per %s è ora DISATTIVATA."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista SOP di %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Il canale %s non è registrato"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND canale [motivo]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "L'opzione Secure founder per %s è ora DISATTIVATA."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "L'opzione Secure ops per %s è ora DISATTIVATA."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "L'opzione Secure per %s è ora DISATTIVATA."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Opzione secure SPENTA per %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "I Services non riescono a cambiare i modi. I server sono configurati "
-#~ "correttamente?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "I Services sono up da %d giorno, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "I Services sono up da %d ora, %d minuto"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "I Services sono up da %d ora, %d minuti"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "I Services sono up da %d ore, %d minuto"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "I Services sono up da %d minuto, %d secondo"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "I Services sono up da %d minuto, %d secondi"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "I Services sono up da %d minuti, %d secondo"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "L'opzione Signed kick per %s è ora DISATTIVATA."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Spiacente, la modifica della lista HOP è temporaneamente disabilitata."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Spiacente, la modifica della lista SOP è temporaneamente disabilitata."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Spiacente, la modifica della lista VOP è temporaneamente disabilitata."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Spiacente, puoi avere un massimo di %d nick nelle liste SOP/AOP/HOP/VOP "
-#~ "di un canale."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "La modalità symbiosis ora è DISATTIVA sul canale %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Sintassi: RANDOMNEWS ADD testo"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR canale cosa"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Sintassi: OPERNEWS ADD testo"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Sintassi: SET DEBUG {ON | OFF | numero}\n"
-#~ "\n"
-#~ "Attiva o disattiva la modalità di debug. In modalità di\n"
-#~ "debug, tutti i dati inviati e ricevuti dai Services,\n"
-#~ "nonché altri messaggi di debug, saranno scritti nel file\n"
-#~ "di log. Se viene specificato un numero, la modalità\n"
-#~ "di debug sarà attivata, e il livello di debug sarà\n"
-#~ "impostato a numero.\n"
-#~ "\n"
-#~ "Questa opzione è equivalente all'opzione di riga di comando\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Sintassi: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Messaggio di saluto per %s rimosso."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "Questo modulo non può essere rimosso."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Il blocco del topic per %s è ora DISATTIVATO."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "La memorizzazione del topic per %s è ora DISATTIVATA."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Comando sconosciuto %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Opzione %s sconosciuta.\n"
-#~ "Digita /msg %s HELP KICK per maggiori informazioni."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "L'utente %s non è presente nel database di NickServ."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista VOP di %s:\n"
-#~ "  Num  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Il bot %s è stato eliminato."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] Il memo che hai inviato a %s è stato letto."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "L'ultimo memo inviato a %s è stato annullato."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Il tuo vhost (%s) ora è attivato."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Il bot %s è stato eliminato."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "Il sistema di liste xOP per %s è ora DISATTIVATO."
diff --git a/language/anope.nl_NL.po b/language/anope.nl_NL.po
index a093c0ffa..b80b56ca9 100644
--- a/language/anope.nl_NL.po
+++ b/language/anope.nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:53-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Dutch\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s voor meer informatie."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s heeft het DEFCON niveau veranderd naar %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s toegevoegd aan %s toeganslijst met niveau %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s toegevoegd aan %s autokick lijst."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s toegevoegd aan %s slechte woorden lijst."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s toegevoegd aan de AKILL lijst."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s toegevoegd aan de SNLINE lijst."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s toegevoegd aan de SQLINE lijst."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s toegevoegd aan de SZLINE lijst."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s toegevoegd aan je toegangslijst."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -36,15 +93,16 @@ msgstr ""
 "Voor meer informatie over een specifiek commando, type\n"
 "/msg %s HELP commando."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s stelt je in staat een bot op je eigen kanaal te hebben.\n"
 "Het is gemaakt voor gebruikers die geen eigen bot kunnen\n"
@@ -54,8 +112,8 @@ msgstr ""
 "/msg %s commando typen. Voor meer informatie over een\n"
 "specifiek commando moet je /msg %s HELP command typen."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -74,124 +132,56 @@ msgstr ""
 "specifiek commando type je /msg %s HELP commando.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s is een services die IRC gebruikers in staat stelt om\n"
-"korte berichten te sturen naar andere IRC gebruikers, online\n"
-"of offline, of naar kanalen(*). De verstuurder's nick en de\n"
-"nick van de vanger, of het kanaal waar de memo naartoe gaat,\n"
-"moeten geregistreerd zijn om de memo te versturn.\n"
-"\n"
-"%s's commando's bevatten:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s heeft het DEFCON niveau veranderd naar %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s toegevoegd aan %s toeganslijst met niveau %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s toegevoegd aan %s autokick lijst."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s toegevoegd aan %s slechte woorden lijst."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s toegevoegd aan de AKILL lijst."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s toegevoegd aan de SNLINE lijst."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s toegevoegd aan de SQLINE lijst."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s toegevoegd aan de SZLINE lijst."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s toegevoegd aan je toegangslijst."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s toegevoegd aan je toegangslijst."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s bestaat al op %s slechte woorden lijst."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s bestaat al op %s autokick lijst."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s bestaat al op de AKILL lijst."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s bestaat al op de uitzonderingenlijst."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s bestaat al op de SNLINE lijst."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s bestaat al op de SQLINE lijst."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s bestaat al op de SZLINE lijst."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s kan niet worden ingesteld als aantal keer om te bannen."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s heeft je gebruikersmodes veranderd."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -205,42 +195,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s verwijderd van %s AOP lijst."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s verwijderd van %s toegangslijst."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s verwijderd van %s autokick lijst."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s verwijderd van %s slechte woorden lijst."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s verwijderd van de sessie limiet uitzonderingenlijst."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s verwijderd van de AKILL lijst."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s verwijderd van de SNLINE lijst."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s verwijderd van de SQLINE lijst."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s verwijderd van de SZLINE lijst."
@@ -250,71 +240,80 @@ msgstr "%s verwijderd van de SZLINE lijst."
 msgid "%s deleted from your access list."
 msgstr "%s verwijderd van je toegangslijst."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s verwijderd van je toegangslijst."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s verwijderd van je toegangslijst."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s uitgeschakeld op kanaal %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s heeft te veel geregistreerde kanalen."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s is een services die IRC gebruikers in staat stelt om\n"
+"korte berichten te sturen naar andere IRC gebruikers, online\n"
+"of offline, of naar kanalen(*). De verstuurder's nick en de\n"
+"nick van de vanger, of het kanaal waar de memo naartoe gaat,\n"
+"moeten geregistreerd zijn om de memo te versturn.\n"
+"\n"
+"%s's commando's bevatten:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s is al gedekt door %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s toegevoegd aan je toegangslijst."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s is geen geldig ban type."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s is geen geldige bot of geregistreerd kanaal."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s is geen geldig e-mail adres."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s is momenteel niet op kanaal %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "Nick %s niet gevonden op de negeer-lijst."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s komt overeen met een uitzondering op %s en kan niet worden gebanned "
-"totdat de uitzondering is verwijderd."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -325,12 +324,12 @@ msgstr "%s verplaatst naar %s AOP lijst."
 msgid "%s not found on %s %s list."
 msgstr "%s niet gevonden op %s AOP lijst."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s niet gevonden op %s toegangslijst."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s niet gevonden op %s autokick lijst."
@@ -340,32 +339,32 @@ msgstr "%s niet gevonden op %s autokick lijst."
 msgid "%s not found on %s bad words list."
 msgstr "%s niet gevonden op %s slechte woorden lijst."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s niet gevonden op de sessie lijst."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s niet gevonden op de sessie limiet uitzonderingenlijst."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s niet gevonden op de AKILL lijst."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s niet gevonden op de SNLINE lijst."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s niet gevonden op de SQLINE lijst."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s niet gevonden op de SZLINE lijst."
@@ -375,12 +374,17 @@ msgstr "%s niet gevonden op de SZLINE lijst."
 msgid "%s not found on your access list."
 msgstr "%s niet gevonden op je toegangslijst."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s niet gevonden op je toegangslijst."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s verwijderd van je toegangslijst."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -404,19 +408,13 @@ msgstr "%s zal nu genegeerd worden voor %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s zal nu permanent genegeerd worden."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr ""
 "Waarschuwing: Alle commando's die naar %s gestuurd worden worden gelogd!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Let op: Services zijn in alleen-lezen mode; veranderingen worden niet "
-"opgeslagen!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -424,11 +422,12 @@ msgstr ""
 "Reminder: AKILL masks kunnen geen nicknames bevatten; ben er zeker van dat "
 "je geen nick-deel in je mask hebt."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Herrinering: Je kan alleen IP masks toevoegen aan de SZLINE lijst."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -480,22 +479,22 @@ msgstr "[auto-memo] De memo die je gestuurd hebt is bekeken."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER wachtwoord email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER wachtwoord email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP doel wachtwoord"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -512,7 +511,7 @@ msgstr ""
 "kwaadwillige acties te helpen. Misbruik van %s zal resulteren in,\n"
 "minimaal, verlies van de misbruikte nick(s)."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -524,7 +523,8 @@ msgstr ""
 "ze hoeven te indentificeren via een wachtwoord, en kunnen de\n"
 "toegangs-, AKICK-, en niveau-lijsten bekijken voor elk kanaal."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -536,995 +536,343 @@ msgstr ""
 "mogen de toegangslijst voor elke nick bekijken.\n"
 "(/msg %s ACCESS LIST nick)"
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "               Opties: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "               vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "             Bot nick: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "             Bot nick: nog geen toegewezen."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "              Opties: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "   Hoofdletter kicker: %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "   Hoofdletter kicker: %s (%d kick(s) om te bannen; minimaal %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "   Hoofdletter kicker: %s (minimaal %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Stichter: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "        Ban type: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "           Vet kicker: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "           Vet kicker: %s (%d kick(s) om te bannen)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "         Flood kicker: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "         Flood kicker: %s (%d kick(s) om te bannen; %d regels in %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "         Flood kicker: %s (%d regels in %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Mask: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "       Kleuren kicker: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "       Kleuren kicker: %s (%d kick(s) om te bannen)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "        Ban type: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr " Laatst gebruikt: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Modeslot: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Herhalings kicker: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Herhalings kicker: %s (%d kick(s) om te bannen; %d maal)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Herhalings kicker: %s (%d maal)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "        Opvolger: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Tijdelijk buiten werking gesteld: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "   Hoofdletter kicker: %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "           Vet kicker: %s (%d kick(s) om te bannen)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "      Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "      Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "   Laatste topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "   Geregistreerd: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (uitgeschakeld)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (alleen stichter)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     De lijst met toegestane adressen wijzigen"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Wijzig de lijst van toegestane gebruikers"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Beheer de AutoKick lijst"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Beheer de AutoKick lijst"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Beheer de AKILL lijst"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Wijzig de lijst van AOP's"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Wijs een bot toe aan een kanaal"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Beheer slechte-woorden lijst"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       Stelt in hoe Services bans op het kanaal maken"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Beheer de lijst met bots op het netwerk"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Geef beschikbare bots weer"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Annuleer je laatst verzonden memo"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL all users on a specific channel"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Geef alle kanalen weer"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Kijk of je laatste memo naar iemand is gelezen"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "    Gemaakt: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulate the DefCon system"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Verwijder de vhost van een andere gebruiker"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Verwijder een of meerdere memo's"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Verwijder de vhost voor alle nicks in een groep"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Stelt de kanaalbeschrijving in"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Stel de weergave van je groep in Services in"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Annuleer een kanaalregistratie"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       De registratie van je nickname annuleren"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "    Beschrijving: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Associeer een E-mail adres met je nick"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Beheer de sessie-limiet uitzonderingen lijst"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Verbied het gebruik van een kanaal"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Voorkom dat een nick gebruikt wordt"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Stelt de stichter van het kanaal in"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Bekijk het wachtwoord voor een nick\n"
-"               (alleen als encryptie is uitgeschakeld)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Stuurt een bericht naar alle gebruikers"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Associeer een begroeting met je nick"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Stelt de vhost voor all nicks in een groep gelijk"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Bij een groep aanmelden"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "       Groet-bericht: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Verberg verschillende soorten nick informatie"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Jezelf identificeren met je wachtwoord"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Wijzig de Services negeer-lijst"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Wijzig de Services negeer-lijst"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Toont info over jouw memo's"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Jupiter\" een server"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-"    KEEPTOPIC     Onthoud het topic zoland het kanaal niet in\n"
-"                    gebruik is"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Configureer kickers"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kick een gebruiker uit een kanaal"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Zet bescherming aan of uit"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Selecteer de taal die Services zal gebruiken\n"
-"                   voor het versturen van berichten naar jou"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Verander de betekenissen van toegangsniveaus"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Geeft een of meer vhosts weer."
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Geef je memo's weer"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Stel de berichten in die gebruikers krijgen als\n"
-"                ze inloggen"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Verander de modes op een kanaal"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Verwijder alle modes van een kanaal"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Info over een geladen module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Geef geladen modules weer"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Laad een module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Laad een module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Ontlaad een module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Verander de communicatiemanier van Services"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Verwijder tijdelijk alle O:regels van een server\n"
-"                op afstand"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deactiveert je toegewezen vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Geef Operflags aan een bepaalde gebruiker"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Activeert je toegewezen vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    Stel de berichten in die gebruikers te zien krijgen\n"
-"                die OPER worden"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Stuur een notice wanneer de OP/DEOP commando's\n"
-"                    worden gebruikt."
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "     Opties: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Verander het wachtwoord voor je nick"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Reguleer het gebruik van kritieke commando's"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Verberg een kanaal van het LIST commando"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Sluit Services af zonder databases op te slaan"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Stel de berichten in waarvan gebruikers er willekeurig\n"
-"                een te zien krijgen als ze inloggen"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Lees een of meerdere memo's"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Een andere gebruiker killen die je nick gebruikt"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Registreer een nickname"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Registreer een nickname"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE    Je nick terugnemen nadat je RECOVER gebruikt hebt"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Herlaad Services' configuratie bestand"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords."
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Sla databases op en herstart Services"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Limiteer toegang tot het kanaal"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Verstuur een memo en verzoek een ontvangstbevestiging"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "  Inverterings kicker: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "  Inverterings kicker: %s (%d kick(s) om te bannen)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Activeer %s veiligheidsopties"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Zet nickname beveiliging aan of uit"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER Sterkere controle van de stichter status"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Sterkere controle van de kanaalop status"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Vertstuur een memo naar een nick of kanaal"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Stuur een memo naar alle geregistreerde gebruikers "
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Je wachtwoord vergeten? Probeer dit"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Bekijk de lijst met sessies per host"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Configureer bot opties"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Stel de vhost van een andere gebruiker in"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Stel verscheidene globale Services opties in"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Stel kanaal opties en informatie in"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Opties instellen, inclusief kill bescherming"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Stel opties gerelateerd aan memo's in"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Stel de vhost voor alle nicks in een groep in"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Sla databases op en sluit Services af"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr ""
-"    SIGNKICK      Onderteken kicks die worden uitgevoerd met het\n"
-"                    KICK commando"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Beheer de SNLINE lijst"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Wijzig de lijst van SOP's"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Beheer de SQLINE lijst"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Display Services staff and online status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF  Stuur een memo naar alle opers/admin"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Geeft de status van Services en netwerk weer"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Geeft het huidige toegangsniveau van een gebruiker\n"
-"               op een kanaal weer"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Stelt de opvolger van het kanaal in"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Stel een kanaal tijdelijk buiten werking terwijl de\n"
-"               kanaal-data en -instellingen bewaard blijven."
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forcefully change a user's nickname"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Beheer de SZLINE lijst"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Topic kan alleen veranderd worden met TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Wijzigt de modus van een gebruiker"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr ""
-"    UNSUSPEND  Stelt een tijdelijk buiten werking gesteld kanaal weer\n"
-"               in werking"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Forceer dat de Services database onmiddelijk\n"
-"                op de harde schijf wordt weggeschreven"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Geef alle gebruikers weer"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Gebruikt op: %d kana(a)l(en)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Schakel het gebruikersprivilegesysteem om"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr " Foute woorden kicker: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr " Foute woorden kicker: %s (%d kick(s) om te bannen)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "        E-mail adres: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "       Is online van: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "  Tijd laatst gezien: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Topic gezet door: %s"
@@ -1534,20 +882,6 @@ msgstr "Topic gezet door: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1558,26 +892,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1587,99 +912,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr " Echte naam: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "  Tijd geregistreerd: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Onderstrepings kicker: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Onderstrepings kicker: %s (%d kick(s) om bannen)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Nr   Verstuurder       Datum/Tijd"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Jupiter\" een server"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (door %s op %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (door %s op %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1698,17 +1006,12 @@ msgstr ""
 "%5d (%s door %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d   %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "%s commando's:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s wordt niet geinformeerd over nieuwe memo's."
@@ -1718,34 +1021,34 @@ msgstr "%s wordt niet geinformeerd over nieuwe memo's."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (door %s op %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modules geladen."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots beschikbaar."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicks in de groep."
@@ -1756,14 +1059,14 @@ msgstr "%d nicks in de groep."
 msgid "%s %s list is empty."
 msgstr "%s AOP lijst is leeg."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s toegangslijst is leeg."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s autokick lijst is leeg."
@@ -1773,7 +1076,7 @@ msgstr "%s autokick lijst is leeg."
 msgid "%s bad words list is empty."
 msgstr "%s slechte woorden lijst is leeg."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s kan de opvolger niet zijn op kanaal %s omdat hij/zij founder is."
@@ -1783,47 +1086,47 @@ msgstr "%s kan de opvolger niet zijn op kanaal %s omdat hij/zij founder is."
 msgid "%s cannot receive memos."
 msgstr "%s kan geen memo's ontvangen."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "%s commando's:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "%s dekking is te groot; Gebruik aub een meer specifiek hostmask."
+msgid "%s commands:"
+msgstr "%s commando's:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s heeft momenteel %d memo's, waarvan er %d ongelezen zijn."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s heeft momenteel %d memo's, waarvan er 1 ongelezen is."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s heeft momenteel %d memo's."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s heeft momenteel %d memo's; allemaal zijn ze ongelezen."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s heeft momenteel 1 memo, en deze is nog ongelezen."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s heeft momenteel 1 memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s heeft momenteel geen memo's."
@@ -1833,47 +1136,27 @@ msgstr "%s heeft momenteel geen memo's."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s heeft momenteel te veel memo's en kan er geen meer ontvangen."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s heeft geen memo limiet."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s heeft geen memo's."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s heeft geen nieuwe memo's."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s is %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s is momenteel offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s is momenteel online."
@@ -1895,24 +1178,24 @@ msgstr "%s is ingeschakeld"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is geen SuperAdminstrator meer"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s wordt niet geinformeerd over nieuwe memo's."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s wordt geinformeerd over nieuwe memo's wanneer je inlogt en wanneer deze "
 "arriveren."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s wordt geinformeerd over nieuwe memo's wanneer je inlogt."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s wordt geinformeerd over nieuwe memo's wanneer deze arriveren."
@@ -1931,6 +1214,11 @@ msgstr ""
 "AOP lijst voor %s:\n"
 "  Num  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1972,63 +1260,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) toegevoegd aan de bot lijst."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s's memo limiet is %d, en mag niet worden veranderd."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s's memo limiet is %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL elke nieuwe client die connecteerd"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Forceer Kanaal Modes (%s) op alle kanalen"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Negeer elke non-oper met een boodschap"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill elke nieuwe client die connecteerd"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Geen MLOCK veranderingen"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Geen nieuwe channel registratie's"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Geen nieuwe memo's verzenden"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Geen nieuwe nick registratie's"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Negeer non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Gebruik de beperkte sessie limiet van %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<onbekend>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Een memo werd gestuurd naar alle geregistreerde gebruikers."
 
@@ -2041,38 +1332,29 @@ msgstr ""
 "Een notificatie-memo is naar %s verstuurd om hem/haar te\n"
 "informeren dat je zijn/haar memo gelezen hebt."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Een verificatiecode is verstuurd naar %s. Type /msg %s confirm "
 "<verificatiecode> om de registratie te voltooien."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "Een vhost ident moet in een geldig ident formaat zijn."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Een vhost moet in een geldig hostmask formaat zijn."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS kanaal {ADD|DEL|LIST|VIEW|CLEAR} [nick [niveau] | lijst]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT kanaal text"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
@@ -2086,17 +1368,22 @@ msgstr ""
 "AKICK kanaal {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-of-usermask] [reden]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE voor %s compleet; %d gebruikers zijn getroffen."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL all users on a specific channel"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "AKILL lijst is leeg."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2105,43 +1392,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kanaal nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Toegang geweigerd."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Toegangsniveau voor %s op %s veranderd in %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Toegangsniveau voor %s op %s onveranderd van %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Toegansniveau moet tussen de %d en %d inclusief liggen."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Toegangsniveau mag geen nul zijn."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Toegangsniveau instellingen voor kanaal %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Toegangsniveaus voor %s teruggezet naar standaardwaarden."
@@ -2156,20 +1434,11 @@ msgstr "Access list for %s is empty."
 msgid "Access list for %s:"
 msgstr "Toegangslijst voor %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Toegangslijst voor %s:\n"
-"  Num   Niv  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Toegangslijst:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2178,6 +1447,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Activeer %s veiligheidsopties"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Activeert je toegewezen vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2198,7 +1477,7 @@ msgstr "Nieuw oper nieuwsbericht toegevoegd (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Nieuw willekeurig nieuwsbericht toegevoegd (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2211,22 +1490,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Alle O:lines van %s zijn verwijderd."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Alle O:lines van %s zijn hersteld."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
@@ -2235,12 +1514,12 @@ msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 msgid "All logon news items deleted."
 msgstr "Alle login nieuwsberichten zijn verwijderd."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Alle memo's voor kanaal %s zijn verwijderd."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Al je memo's zijn verwijderd."
 
@@ -2252,22 +1531,22 @@ msgstr "Alle oper nieuwsberichten zijn verwijderd."
 msgid "All random news items deleted."
 msgstr "Alle willekeurige nieuwsberichten zijn verwijderd."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Alle users zijn gekicked van kanaal %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Alle vhost's in de groep %s zijn ingesteld op %s@%s"
@@ -2389,12 +1668,34 @@ msgstr "Toegestaan om FANTASIA commando's te gebruiken"
 msgid "Allowed to view the access list"
 msgstr "Toegestaan om de toegangslijst te bekijken"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Wijs een bot toe aan een kanaal"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Associeer een begroeting met je nick"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Associeer een E-mail adres met je nick"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Autokick lijst voor %s:"
@@ -2419,17 +1720,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Automatisch mode +v"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS kanaal {ADD|DEL|LIST|CLEAR} [woord | entry-lijst] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2448,26 +1749,26 @@ msgstr ""
 "Slechte woorden lijst voor %s:\n"
 "  Nr    Woord                          Type"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Slechte woorden lijst is nu leeg."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Ban type voor kanaal %s is nu #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s bestaat al."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Bot %s bestaat niet."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s toegewezen aan %s."
@@ -2482,27 +1783,27 @@ msgstr "Bot %s is veranderd in %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Bot %s is verwijderd."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Channel %s heeft al een bot toegewezen namelijk: %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot zal ops kicken op kanaal %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot zal voices kicken op kanaal %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot zal geen ops kicken op kanaal %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot zal geen voices kicken op kanaal %s."
@@ -2532,16 +1833,11 @@ msgstr "Bot Idents mogen alleen geldige tekens bevatten."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks mogen alleen geldige nick-tekens bevatten."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Bot is niet in kanaal %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Bot lijst:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2550,7 +1846,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2561,7 +1857,7 @@ msgstr ""
 "%d kicks voor dezelde gebruiker. Gebruik BADWORDS commando\n"
 "om slechte woorden toe te voegen of te verwijderen."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2569,7 +1865,7 @@ msgstr ""
 "Bot zal nu kicken op slechte woorden. Gebruik het BADWORDS commando\n"
 "om slechte woorden toe te voegen of te verwijderen."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2578,11 +1874,11 @@ msgstr ""
 "Bot zal nu kicken op vet, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Bot zal nu kicken op vet."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2593,7 +1889,7 @@ msgstr ""
 "%d karakters en %d%% van het gehele bericht), en zal \n"
 "een ban plaatsen na %d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2602,7 +1898,7 @@ msgstr ""
 "Bot zal nu kicken op hoofdletters (bij minstens\n"
 "%d karakters en %d%% van het gehele bericht)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2611,11 +1907,11 @@ msgstr ""
 "Bot zal nu kicken op kleuren, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Bot zal nu kicken op kleuren."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2624,12 +1920,12 @@ msgstr ""
 "Bot zal nu kicken op flood (%d regels in %d seconden), \n"
 "en zal een ban zitten na %d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot zal nu kicken op flood (%d regels in %d seconden)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2638,11 +1934,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2653,7 +1949,7 @@ msgstr ""
 "hetzelfde zeggen), en zal een ban zetten na %d\n"
 "kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2662,7 +1958,7 @@ msgstr ""
 "Bot zal nu kicken op herhalingen (users die %d maal\n"
 "hetzelfde zeggen)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2671,11 +1967,11 @@ msgstr ""
 "Bot zal nu kicken op inverteringen, en zal een ban zetten na\n"
 "%d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Bot zal nu kicken op inverteringen."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2684,16 +1980,16 @@ msgstr ""
 "Bot zal nu kicken op onderstrepingen, en zal een ban zetten na \n"
 "%d kicks voor dezelfde gebruiker."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Bot zal nu kicken op onderstrepingen."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Bot zal nu kicken op kleuren."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2702,182 +1998,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot zal niet meer kicken op slechte woorden."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot zal niet meer kicken op vet."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Bot zal niet meer kicken op hoofdletters."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Bot zal niet meer kicken op kleuren."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Bot zal niet meer kicken op flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot zal niet meer kicken op herhalingen."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot zal niet meer kicken op inverteringen."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot zal niet meer kicken op onderstrepingen."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Bot zal niet meer kicken op hoofdletters."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d records, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots gereserveerd voor IRC operators:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "   Bytes gelezen: %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes geschreven: %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kanaal}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [text|nr]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kanaal [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR kanaal wat"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Annuleer je laatst verzonden memo"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Annuleer een kanaalregistratie"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       De registratie van je nickname annuleren"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Onmogelijk e-mail te sturen; probeer na een tijdje opnieuw."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Bot lijst:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Access list for %s is empty."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Toegangslijst voor %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d records, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Gebruikersmodes van %s veranderd."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s heeft je gebruikersmodes veranderd."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Channel %s bestaat niet."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Verander de communicatiemanier van Services"
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Gebruikersmodes van %s veranderd."
+
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Kanaal %s is gede-registreerd."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Channel %s is verboden door %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Kanaal %s is al geregistreerd!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Kanaal %s is nu verboden."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Kanaal %s is nu weer in werking gesteld."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Kanaal %s is tijdelijk buiten werking gesteld."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Channel %s is niet geregistreerd."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Channel %s mag niet geregistreerd of gebruikt worden."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Kanaal %s mag niet geregistreerd worden."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Kanaal %s is geregistreerd onder jouw nickname: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kanaal        : %6d records, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Kanaal %s zal verlopen."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Kanaal %s zal niet verlopen."
@@ -2887,33 +2208,28 @@ msgstr "Kanaal %s zal niet verlopen."
 msgid "Channel %s %s list has been cleared."
 msgstr "Kanaal %s AOP lijst is leeggemaakt."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanaal %s toegangslijst is leeggemaakt."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Kanaal %s autokick lijst is leeggemaakt."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Kanaal %s is nu weer in werking gesteld."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "Kanaal SQLINEs worden niet ondersteund door je IRCd, dus kun je ze niet "
 "gebruiken."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2921,7 +2237,7 @@ msgstr ""
 "Kanalen lijst:\n"
 "Naam                 Gebruikers Modes   Topic"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2930,7 +2246,7 @@ msgstr ""
 "Kanalen waarop %s toegang heeft:\n"
 "  Nr   Kanaal               Niveau   Beschrijving"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2938,16 +2254,46 @@ msgstr ""
 "Kanalen waarop je toegang hebt:\n"
 "  Nr   Kanaal               Niveau   Beschrijving"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Kijk of je laatste memo naar iemand is gelezen"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Configureer bot opties"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Configureer kickers"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Verwijder alle modes van een kanaal"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Kan kanaal %s niet terug in werking stellen!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Huidige AKILL lijst:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2955,15 +2301,15 @@ msgstr ""
 "Huidige AKILL lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Huidige Module lijst:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Huidige SNLINE lijst:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2971,11 +2317,11 @@ msgstr ""
 "Huidige SNLINE lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Huidige SQLINE lijst:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2983,11 +2329,11 @@ msgstr ""
 "Huidige SQLINE lijst:\n"
 "  Nr    Mask                              Reden"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Huidige SZLINE lijst:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2996,7 +2342,7 @@ msgstr ""
 "  Nr    Mask                              Reden"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Huidige Sessie Limiet Uitzonderingenlijst:"
 
@@ -3020,56 +2366,61 @@ msgstr "Huidig aantal SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Huidig aantal SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Huidige gebruikers: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kanaal] {nr | lijst | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP kanaal"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deactiveert je toegewezen vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3194,6 +2545,47 @@ msgstr "Standaard SZLINE verloop tijd: 1 minuut"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Standaard SZLINE verloop tijd: Verloopt niet"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Stel de berichten in die gebruikers krijgen als\n"
+"                ze inloggen"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Stel de berichten in die gebruikers krijgen als\n"
+"                ze inloggen"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    Stel de berichten in die gebruikers te zien krijgen\n"
+"                die OPER worden"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Verwijder een of meerdere memo's"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Verwijder de vhost voor alle nicks in een groep"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Verwijder de vhost van een andere gebruiker"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3204,7 +2596,7 @@ msgstr "%d AOPs verwijderd van %s AOP lijst."
 msgid "Deleted %d entries from %s access list."
 msgstr "%d nicks verwijderd van %s toegangslijst."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "%d autokicks verwijderd van %s autokick lijst."
@@ -3244,7 +2636,7 @@ msgstr "%d SZLINEs verwijderd van de SZLINE lijst."
 msgid "Deleted 1 entry from %s access list."
 msgstr "1 nick verwijderd van %s toegangslijst."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "1 autokick verwijderd van %s autokick lijst."
@@ -3279,32 +2671,74 @@ msgstr "1 SZLINE verwijderd van de SZLINE lijst."
 msgid "Deleted one entry from %s %s list."
 msgstr "1 AOP verwijderd van %s AOP lijst."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Beschrijving van %s veranderd in %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
+
+#: modules/core/os_staff.cpp:21
 #, fuzzy
-msgid "Disabled"
-msgstr "uitgeschakeld"
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Display Services staff and online status"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Alle records zijn weergegeven (Aantal: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Alle records getoond van %d tot %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Alle records getoond met overeenkomende key %s (Aantal: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Toont info over jouw memo's"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Geeft een of meer vhosts weer."
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Toont info over jouw memo's"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3333,169 +2767,210 @@ msgstr "Gebruik het woord %s niet in dit kanaal!"
 msgid "Don't use underlines on this channel!"
 msgstr "Gebruik geen onderstrepingen in dit kanaal!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail voor %s is ongeldig."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [paramenters]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails %s komen overeen met %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "ingeschakeld"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Einde van de %s lijst."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Einde van de toegangslijst."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Einde van kanalen lijst."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Einde van de lijst - %d/%d kanalen weergegeven."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Einde van lijst - %d/%d resultaten weergegeven."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Einde van gebruikers lijst."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Nederlands"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Fout! De ident is te lang. Gebruik een ident die korter is dan %d tekens."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Herlaad Services' configuratie bestand"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Fout! De vhost is te lang. Gebruik een host die korter is dan %d tekens."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Uitzondering voor %s (#%d) verplaatst naar positie %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Uitzondering voor %s is veranderd in %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "\tExpires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Verlooptijd van %s veranders."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID kanaal reden"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID kanaal [reden]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nick reden"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [reden]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasie"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "Fantasie mode staat nu AAN op kanaal %s."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "Fantasie mode staat nu AAN op kanaal %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s zal niet meer genegeerd worden."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Hostmask %s bestaat al op je toegangslijst."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Forceer dat de Services database onmiddelijk\n"
+"                op de harde schijf wordt weggeschreven"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forcefully change a user's nickname"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Je wachtwoord vergeten? Probeer dit"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Stichter van kanaal %s veranderd in %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host geen Wildcards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nickname"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS commando is onbeschikbaar omdat encryptie aanstaat."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nickname [wachtwoord]"
 
@@ -3503,11 +2978,26 @@ msgstr "GHOST nickname [wachtwoord]"
 msgid "GLOBAL message"
 msgstr "GLOBAL bericht"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Ghost met jouw nick is gekilld."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Geef Operflags aan een bepaalde gebruiker"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Begroeting"
 
@@ -3515,78 +3005,156 @@ msgstr "Begroeting"
 msgid "Greet message displayed"
 msgstr "Groetingsbericht weergegeven"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Begroetingsmode staat nu AAN op kanaal %s."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Begroetingsmode staat nu AAN op kanaal %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords."
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators.\t"
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators.\t"
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Verberg verschillende soorten nick informatie"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Verberg een kanaal van het LIST commando"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts met tenminste %d sessies:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY wachtwoord"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tijd] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO kanaal"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {kanaal | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE kanaal"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Jezelf identificeren met je wachtwoord"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Als je niet binnen 20 seconden je nick verandert, verander ik je nick."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Als je niet binnen 1 minuut je nick verandert, verander ik je nick."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Negeer-lijst is leeggemaakt."
@@ -3595,12 +3163,13 @@ msgstr "Negeer-lijst is leeggemaakt."
 msgid "Ignore list is empty."
 msgstr "Negeer-lijst is leeg."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Bot lijst:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3616,25 +3185,17 @@ msgstr ""
 "Type /msg %s HELP SET optie voor meer informatie over een\n"
 "specifieke optie."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Ongeldig bereik opgegeven. Het correct gebruik is #van-tot."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Info over een geladen module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informatie voor bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informatie voor kanaal %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Ongeldige verloop tijd."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3642,14 +3203,11 @@ msgstr ""
 "Ongeldige hostmask. Alleen echte hostmasks zijn geldig als uitzondering "
 "omdat deze niet worden vergeleken met nicks of usernames."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Ongeldige verificatiecode ingevuld. Controleer je e-mail nog eens en probeer "
-"opnieuw."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3658,7 +3216,7 @@ msgstr ""
 "Ongeldige sessie limiet. Het moet een geldige integer groter dan of gelijk "
 "aan nul en kleiner dan %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Ongeldige drempel waarrde. Het moet een geldige integer groter dan 1 zijn."
@@ -3667,12 +3225,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE servername [reden]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Bij een groep aanmelden"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kanaal optie {ON|OFF} [instellingen]"
@@ -3681,262 +3244,445 @@ msgstr "KICK kanaal optie {ON|OFF} [instellingen]"
 msgid "KICK channel user reason"
 msgstr "KICK kanaal gebruiker reden"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kick een gebruiker uit een kanaal"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Een andere gebruiker killen die je nick gebruikt"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kanaal {SET | DIS[ABLE] | LIST | RESET} [item [niveau]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST trefbeeld"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST trefbeeld [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kanaal] [lijst | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP doel wachtwoord"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Taal veranderd in Nederlands."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Laatste memo naar %s is ge-annuleerd."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Laatste quit-bericht: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Laatst bekende adres: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Niveau voor %s op kanaal %s veranderd in %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Niveau moet tussen de %d en %d inclusief zijn."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Dit commando is nutteloos in deze mode."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lijst van nicks overeenkomend met %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Geef geladen modules weer"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lijst van nicks in de groep van %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lijst van nicks in je groep:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Geef je memo's weer"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Geef alle kanalen weer"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lijst van nicks in je groep:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Geef alle gebruikers weer"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Geef beschikbare bots weer"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Laad een module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Lokale kanalen kunnen niet geregistreerd worden."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Login nieuwsbericht #%d verwijderd."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Login nieuwsbericht #%d niet gevonden!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Login nieuwsberichten:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE kanaal modes"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO bestandsnaame"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD bestandsnaam"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD bestandsnaam"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD bestandsnaam"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Beheer de AutoKick lijst"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Beheer slechte-woorden lijst"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Beheer de lijst met bots op het netwerk"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Beheer de AutoKick lijst"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Wijzig de Services negeer-lijst"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Beheer de AKILL lijst"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulate the DefCon system"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Beheer de SNLINE lijst"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Beheer de SQLINE lijst"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Beheer de SZLINE lijst"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Hostmask %s bestaat al op je toegangslijst."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Hostmask moet gegeven worden in de vorm user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Matches and returns all users that registered using given "
+"email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximum gebruikers: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d van %s (%s).  Om te verwijderen, type: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d van %s (%s).  Om te verwijderen, type: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d is verwijderd."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Memo limit voor %s uitgeschakeld."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Memo limiet voor %s veranderd in %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Memo limiet voor %s veranderd in 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Memo limiet te hoog; limitatie ingesteld op %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo verstuurd naar %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ nr"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ nr"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Bericht mode"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "        Modeslot: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Wijzig de Services negeer-lijst"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Wijzig de lijst van AOP's"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Wijzig de lijst van SOP's"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     De lijst met toegestane adressen wijzigen"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Wijzig de lijst van toegestane gebruikers"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Beheer de sessie-limiet uitzonderingen lijst"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s geladen"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s geladen"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s is uitgeladen"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Versie: %s Auteur: %s Geladen: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliassen   : %6d records, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Groepen    : %6d records, %5d kB"
@@ -3949,11 +3695,13 @@ msgstr "Wordt nooit gekicked door bot kickers"
 msgid "New memo"
 msgstr "Nieuwe memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Nieuwe memo's voor %s.  Om te lezen, type: /msg %s READ nr"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Nieuwe memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 
@@ -3961,141 +3709,107 @@ msgstr "Nieuwe memo's voor %s.  Om te lezen, type: /msg %s READ %s nr"
 msgid "News list is full!"
 msgstr "Nieuws lijst is vol!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Nick %s is verboden door %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Nickname %s is gedropped."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Nickname %s is al geregistreerd!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is een illegale nickname en mag niet worden gebruikt."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is momenteel in gebruik."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s is nu verboden."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is deel van de Services van dit netwerk."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s wordt niet vastgehouden."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Nick %s is momenteel niet in gebruik."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Nick %s is niet geregistreerd."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Nick %s mag niet geregistreerd of gebruikt worden."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Nick %s niet gevonden op de negeer-lijst."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s is verkort naar %d tekens."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s heeft geen memo van jou."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s is uitgelogd."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is tijdelijk buiten werking gesteld."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is nu vrijgegeven."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is tijdelijk buiten werking gesteld."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick is NIET geregistreerd, probeer later opnieuw."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nickname %s geverificeerd."
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nickname %s is gedropped."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Nickname %s is al geregistreerd!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Nickname %s mag niet geregistreerd worden."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Nickname %s is geregistreerd onder jouw account: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s is geregistreerd."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nickname Registratie (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4106,26 +3820,36 @@ msgstr ""
 "automatisch verlopen, oftewel: ze zullen verwijderd worden na\n"
 "%d dagen inactiviteit."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now off on channel %s."
 msgstr "Geen Bot mode staat nu AAN op kanaal %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/bs_set.cpp:136
+#, fuzzy, c-format
+msgid "No Bot mode is now on on channel %s."
+msgstr "Geen Bot mode staat nu AAN op kanaal %s."
+
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Geen emails voor %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Geen bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "verloopt niet"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Geen help beschikbaar voor %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Er is geen informatie aanwezig voor module %s"
@@ -4140,13 +3864,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Geen overeenkomsten op %s AOP lijst."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Geen overeenkomsten op %s toegangslijst."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Geen overeenkomsten op %s autokick lijst."
@@ -4157,39 +3881,43 @@ msgstr "Geen overeenkomsten op %s autokick lijst."
 msgid "No matching entries on %s bad words list."
 msgstr "Geen overeenkomsten op %s slechte woorden lijst."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Geen overeenkomsten op de sessie limiet uitzonderingenlijst."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Geen overeenkomsten op de AKILL lijst."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Geen overeenkomsten op de SNLINE lijst."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Geen overeenkomsten op de SQLINE lijst."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Geen overeenkomsten op de SZLINE lijst."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Geen annuleerbare memo's gevonden."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Op dit moment zijn er geen modules geladen"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Geen oper nieuwsberichten om te verwijderen!"
@@ -4198,16 +3926,12 @@ msgstr "Geen oper nieuwsberichten om te verwijderen!"
 msgid "No random news items to delete!"
 msgstr "Geen willekeurige nieuwsberichten om te verwijderen!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Geen reden"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Geen ondertekende kick wanneer SIGNKICK LEVEL is gebruikt"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Geen"
 
@@ -4215,7 +3939,7 @@ msgstr "Geen"
 msgid "Not allowed to join channel"
 msgstr "Niet toegestaan kanaal te joinen indien RESTRICTED"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4226,28 +3950,28 @@ msgstr ""
 "er geen gebruiker die op de toegangslijst staat in die periode\n"
 "het kanaal binnen is gekomen) automatisch zal worden verwijderd."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Nr   Limiet Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OP Notice"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4256,13 +3980,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Oude informatie is gelijk aan de nieuwe."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice option for %s is now ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice option for %s is now ON."
 
 #: modules/core/os_news.cpp:55
@@ -4271,131 +4000,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Oper nieuwsbericht #%d verwijderd."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Oper nieuwsbericht #%d niet gevonden!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper nieuwsberichten:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d records, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Operflags %s zijn toegevoegd voor %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Ops bescherming"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Optie %s kan niet gezet worden op dit netwerk."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Verificatiecode voor %s is %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Wachtwoord geaccepteerd - je wordt nu herkend."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Wachtwoord verificatie benodigd voor dat commando.\n"
-"Probeer opnieuw na het typen van /msg %s IDENTIFY wachtwoord."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Wachtwoord incorrect."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Wachtwoord voor %s is %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Wachtwoord incorrect."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Wachtwoord %s is verstuurd."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Vrede"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace option for %s is now ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Neem contact op met een Operator om een vhost aan deze nick te binden."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Probeer aub opnieuw met een onduidelijker wachtwoord.  Wachtwoorden moeten "
-"tenminste 5 tekens lang zijn, niet iets makkelijk raadbaars (bijv. je echte "
-"naam of je nick), en kan geen tab of spatie bevatten."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Gebruik een geldige servernaam bij het jupen"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Gebruik het # symbool wanner je probeert een kanaal te registeren."
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Wacht %d seconden en probeer opnieuw."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Wacht %d seconden voor het opnieuw gebruiken van het GROUP commando."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4411,63 +4104,122 @@ msgstr "Wacht %d seconden voor je het RSEND commando weer gebruikt."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Wacht %d seconden voor het opnieuw gebruiken van het SEND commando."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Verbied het gebruik van een kanaal"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Stel een kanaal tijdelijk buiten werking terwijl de\n"
+"               kanaal-data en -instellingen bewaard blijven."
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Voorkom dat een nick gebruikt wordt"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Prive"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "Prive mode van bot %s staat nu AAN."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private mode of bot %s is now on."
+msgstr "Prive mode van bot %s staat nu AAN."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
 msgstr "Private option for %s is now ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option for %s is now on."
+msgstr "Private option for %s is now ON."
+
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Bescherming"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Stelt het commando: /msg %s %s ter beschikking"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [text|nr]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kanaal] {lijst | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nickname [wachtwoord]"
 
@@ -4475,15 +4227,15 @@ msgstr "RECOVER nickname [wachtwoord]"
 msgid "REGISTER channel description"
 msgstr "REGISTER kanaal beschrijving"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nickname [wachtwoord]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | kanaal} memo-tekst"
 
@@ -4493,290 +4245,369 @@ msgid "Random news item #%d deleted."
 msgstr "Willekeurig nieuwsbericht #%d verwijderd."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Willekeurig nieuwsbericht #%d niet gevonden!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Willekeurige nieuwsberichten:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Lees een of meerdere memo's"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Verander de betekenissen van toegangsniveaus"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE    Je nick terugnemen nadat je RECOVER gebruikt hebt"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Registreer een nickname"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Registreer een nickname"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Reguleer het gebruik van kritieke commando's"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
 msgstr ""
-"Registratie stap 1 kan verlopen zijn. Gebruik eerst \"/msg %s register "
-"<wachtwoord> <email>\"."
+"    UNSUSPEND  Stelt een tijdelijk buiten werking gesteld kanaal weer\n"
+"               in werking"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Laad een module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Herlaad Services' configuratie bestand"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr "    UNBAN      Remove all bans preventing you from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Limiteer toegang tot het kanaal"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Beperkte Toegang"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Restricted access option for %s is now ON."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Restricted access option for %s is now ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr ""
+"    KEEPTOPIC     Onthoud het topic zoland het kanaal niet in\n"
+"                    gebruik is"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Bekijk het wachtwoord voor een nick\n"
+"               (alleen als encryptie is uitgeschakeld)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Geeft het huidige toegangsniveau van een gebruiker\n"
+"               op een kanaal weer"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY kanaal text"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | kanaal} memo-text"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nickname"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS commando is onbeschikbaar omdat encryptie aanstaat."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limiet"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET kanaal optie instellingen"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET kanaal NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET kanaal PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET kanaal optie parameters"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kanaal DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kanaal DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET kanaal FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET kanaal GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kanaal KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET kanaal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kanaal NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kanaal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kanaal PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kanaal PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kanaal RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kanaal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kanaal SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kanaal SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kanaal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kanaal SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kanaal TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kanaal XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET optie parameters"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET optie instelling"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE nummer"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kanaal] limiet"
 
@@ -4784,7 +4615,7 @@ msgstr "SET LIMIT [kanaal] limiet"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [gebruiker | kanaal] {limiet | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4792,24 +4623,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "SNLINE lijst is leeg."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4817,16 +4648,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst}[:"
 "reden]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "SQLINE lijst is leeg."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4835,54 +4666,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Wachtwoord geaccepteerd - je wordt nu herkend."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Wachtwoord geaccepteerd - je wordt nu herkend."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND kanaal reden"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND kanaal reden"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick reden"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nieuwe nick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "SZLINE lijst is leeg."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4891,64 +4732,120 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+verloop] {mask | toegangslijst} "
 "[reden]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Sla databases op en herstart Services"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Veilig"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Veilige Stichter"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Veilige Ops"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now off."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_securefounder.cpp:40
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now on."
+msgstr "Secure founder option for %s is now ON."
+
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
+msgstr "Secure ops option for %s is now ON."
+
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now on."
 msgstr "Secure ops option for %s is now ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Secure option for %s is now ON."
+
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Veiligheid"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Vertstuur een memo naar een nick of kanaal"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF  Stuur een memo naar alle opers/admin"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Stuur een memo naar alle geregistreerde gebruikers "
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Stuurt een bericht naar alle gebruikers"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Stuur een notice wanneer de OP/DEOP commando's\n"
+"                    worden gebruikt."
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Verstuur een memo en verzoek een ontvangstbevestiging"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Services zijn in Defcon modus. Probeer later opnieuw."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services zijn nu in DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Services is nu in verloop mode."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Services is nu in geen-verloop mode."
 
@@ -4960,7 +4857,7 @@ msgstr "Services is nu in alleen-lezen mode."
 msgid "Services are now in read-write mode."
 msgstr "Services is nu in lezen-schrijven mode."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Services is nu in debug mode (niveau %d)."
@@ -4973,7 +4870,7 @@ msgstr "Services is nu in debug mode."
 msgid "Services are now in non-debug mode."
 msgstr "Services is nu in non-debug mode."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Services zijn geconfigureerd geen e-mail te versturen."
 
@@ -4983,7 +4880,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -4992,152 +4889,193 @@ msgstr ""
 "Services kan geen modes veranderen.  Zijn de  U:lines van je servers goed "
 "geconfigureerd?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Services draaien %d dagen, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services draaien %d uur, %d minuten"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services draaien %d minuten, %d seconden"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Services' configuratie bestand is opnieuw geladen."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Nick is vrijgegeven."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Sessie limiet voor %s veranderd in %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Sessie limitering is tijdelijk uitgeschakeld."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessies       : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessies  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Stel kanaal opties en informatie in"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       Stelt in hoe Services bans op het kanaal maken"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Stel opties gerelateerd aan memo's in"
+
+#: modules/core/ns_set.cpp:24
 #, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Opties instellen, inclusief kill bescherming"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Stelt de kanaalbeschrijving in"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Stel de weergave van je groep in Services in"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Stelt de stichter van het kanaal in"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Selecteer de taal die Services zal gebruiken\n"
+"                   voor het versturen van berichten naar jou"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Stelt de opvolger van het kanaal in"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Stel de vhost voor alle nicks in een groep in"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Stel de vhost van een andere gebruiker in"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Stel verscheidene globale Services opties in"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Verander het wachtwoord voor je nick"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Instelling %s onbekend.  Type /msg %s HELP LEVELS DESC voor een lijst van "
 "geldige instellingen."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "Instelling voor DEBUG moet ON, OFF, of een positief nummer zijn."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Instelling voor NOEXPIRE moet ON of OFF zijn."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Instelling voor alleen-lezen moet ON of OFF zijn."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 "Instelling voor SuperAdministrator moet ON of OFF zijn (moet ook "
 "ingeschakeld zijn in services.conf)"
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signed kick option for %s is now ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Geeft de status van Services en netwerk weer"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr ""
+"    SIGNKICK      Onderteken kicks die worden uitgevoerd met het\n"
+"                    KICK commando"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5146,27 +5084,33 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Ondertekende Kicks"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND is uitgeschakeld op dit netwerk."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Sorry, bot toewijzing is tijdelijk uitgeschakeld."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Sorry, bot creatie gefaald."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Sorry, bot wijzigen is tijdelijk uitgeschakeld."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Sorry, bot opties instellen is tijdelijk uitgeschakeld."
 
@@ -5176,7 +5120,7 @@ msgstr "Sorry, bot opties instellen is tijdelijk uitgeschakeld."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Sorry, kanaal AOP lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Sorry, kanaal toegangslijst modificatie is tijdelijk uitgeschakeld."
 
@@ -5184,64 +5128,43 @@ msgstr "Sorry, kanaal toegangslijst modificatie is tijdelijk uitgeschakeld."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Sorry, kanaal autokick lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 "Sorry, kanaal slechte woorden lijst wijzigen is tijdelijk uitgeschakeld."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Sorry, kanaal de-registratie is tijdelijk uitgeschakeld."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Sorry, kanaal opties instellen is tijdelijk uitgeschakeld."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Sorry, kanaal registratie is tijdelijk uitgeschakeld."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Sorry, identificatie gefaald."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Sorry, kicker configuratie is tijdelijk uitgeschakeld."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Sorry, memo opties instellen is tijdelijk uitgeschakeld."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Sorry, memo's sturen is tijdelijk uitgeschakeld."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Sorry, nickname de-registratie is tijdelijk uitgeschakeld."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Sorry, nickname groeperingen zijn tijdelijk uitgeschakeld."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Sorry, nickname opties aanpassen is tijdelijk uitgeschakeld."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Sorry, nickname registratie is tijdelijk uitgeschakeld."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Sorry, registratie gefaald."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5252,12 +5175,12 @@ msgstr "Sorry, je kan maar %d nicks op de toegangslijst van een kanaal hebben."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Sorry, er zijn maar %d plaatsen op de toegangslijst van een nickname."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Sorry, je kan maar %d nicks op de toegangslijst van een kanaal hebben."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Sorry, je kan maar %d autokick masks op een kanaal hebben."
@@ -5267,21 +5190,16 @@ msgstr "Sorry, je kan maar %d autokick masks op een kanaal hebben."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Sorry, je kan maar %d slechte woorden per kanaal instellen."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Sorry, je hebt je limiet van %d kanaalregistraties overschreden."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Sorry, je hebt je limiet van %d kanaalregistraties bereikt."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Sorry, er zijn maar %d plaatsen op de toegangslijst van een nickname."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statistieken opnieuw gezet."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status geupdate (memos, vhost, chmodes, flags)."
 
@@ -5293,12 +5211,22 @@ msgstr "Stop met flooden!"
 msgid "Stop repeating yourself!"
 msgstr "Stop met jezelf herhalen!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER Sterkere controle van de stichter status"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Sterkere controle van de kanaalop status"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Opvolger voor %s verwijderd."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Opvolger voor %s veranderd in %s."
@@ -5307,21 +5235,36 @@ msgstr "Opvolger voor %s veranderd in %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin instelling is niet ingeschakeld in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Symbiose"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now off on channel %s."
 msgstr "Symbiose mode staat nu AAN op kanaal %s."
 
-#: src/language.cpp:129
+#: modules/core/bs_set.cpp:151
+#, fuzzy, c-format
+msgid "Symbiosis mode is now on on channel %s."
+msgstr "Symbiose mode staat nu AAN op kanaal %s."
+
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Stelt de vhost voor all nicks in een groep gelijk"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Gebruik: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5348,7 +5291,7 @@ msgstr ""
 "2: ban in het formaat *!*@host\n"
 "3: ban in het formaat *!*gebruiker@*.domein"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5361,7 +5304,7 @@ msgstr ""
 "Stelt de beschrijving van een kanaal in, die weergegeven\n"
 "wordt door de LIST en INFO commando's."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5374,7 +5317,7 @@ msgstr ""
 "Veranderd de stichter van een kanaal. De nieuwe nick moet\n"
 "een geregistreerde nick zijn."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5394,7 +5337,7 @@ msgstr ""
 "de volgende gebruiker het kanaal binnenkomt worden\n"
 "teruggezet."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5411,7 +5354,7 @@ msgstr ""
 "het kanaal sturen wanneer de OP of DEOP commando's worden\n"
 "gebruikt voor een gebruiker in het kanaal."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5429,7 +5372,7 @@ msgstr ""
 "gebruiker met een gelijkwaardig of hoger level dan die\n"
 "van zichzelf via de %s commando's."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5474,7 +5417,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5488,7 +5432,7 @@ msgstr ""
 "de prive optie aan staat zal /msg %s LIST het kanaal\n"
 "in geen enkele lijst weergeven."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5503,7 +5447,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5522,7 +5466,7 @@ msgstr ""
 "zijn met hun wachtwoord toegang krijgen tot het kanaal,\n"
 "zoals geregeld door de toegangslijst."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5541,7 +5485,7 @@ msgstr ""
 "stichter en de opvolger kunnen veranderen, en niet degenen\n"
 "die alleen geidentificeerd zijn met %s."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5565,7 +5509,24 @@ msgstr ""
 "er geen opvolger is ingesteld. De nieuwe nick moet een\n"
 "geregistreerde nick zijn."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Gebruik: %s kanaal TOPICLOCK {ON | OFF}\n"
+"\n"
+"Zet de topicslot optie aan of uit voor een kanaal.\n"
+"Wanneer topicslot aan staat zal %s het niet toestaan om\n"
+"het topic van het kanaal te veranderen. Het topic kan dan\n"
+"alleen veranderd worden met het TOPIC commando."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5611,8 +5572,8 @@ msgstr ""
 "Het overschakelen van xOP lijsten naar het toegangslijsten\n"
 "systeem brengt echter geen problemen met zich mee."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5702,7 +5663,7 @@ msgstr ""
 "\n"
 "Het ACCESS CLEAR commando maakt de toegangslijst leeg."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5750,7 +5711,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Geeft de huidige toegangslijst weer."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5762,7 +5723,7 @@ msgstr ""
 "Laat de bot een \"/me\" commando doen op het gegeven kanaal\n"
 "met de gegeven tekst."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5782,7 +5743,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5806,7 +5767,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5863,7 +5824,7 @@ msgstr ""
 "\n"
 "The AKICK CLEAR commando maakt de AutoKick lijst leeg."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5954,7 +5915,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR maakt de AKILL lijst leeg."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5996,7 +5957,7 @@ msgstr ""
 "Kanalen met de NOEXPIRE optie aan zullen voorafgegaan\n"
 "worden door een uitroepteken."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6016,7 +5977,7 @@ msgstr ""
 "\n"
 "Dit gebruik is gelimiteerd tot Services Operatorstrators."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6046,17 +6007,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Gebruik: AOP kanaal ADD nick\n"
 "         AOP kanaal DEL {nick | entry-nr | lijst}\n"
@@ -6099,7 +6049,7 @@ msgstr ""
 "lijsten, en /msg %s HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6113,8 +6063,8 @@ msgstr ""
 "Hierna kun je de bot voor het kanaal instellen zoals je\n"
 "wil."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6135,20 +6085,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Gebruik: BADWORDS kanaal ADD woord [SINGLE | START | END]\n"
 "         BADWORDS kanaal DEL {woord | entry-nr | lijst}\n"
@@ -6187,7 +6123,7 @@ msgstr ""
 "Het BADWORDS CLEAR commando maakt de slechte woorden\n"
 "lijst leeg."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6203,7 +6139,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6245,7 +6181,7 @@ msgstr ""
 "in gebruiker is zal de betreffende gebruiker worden gekilled.\n"
 "Als de nick geregistreerd is, wordt deze gedropped."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6255,7 +6191,7 @@ msgstr ""
 "\n"
 "Geeft alle beschikbare bots op dit netwerk weer."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6268,7 +6204,21 @@ msgstr ""
 "nick of kanaal, indien deze nog niet gelezen is op het moment\n"
 "dat je dit commando gebruikt."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6280,7 +6230,7 @@ msgstr ""
 "gebruikt de complete en echte ident@host voor elke nick,\n"
 "en forceerd dan een AKILL."
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6302,7 +6252,7 @@ msgstr ""
 "weergegeven. Als SECRET is gegeven worden alleen kanalen\n"
 "die met trefbeeld overeenkomen en +s of +p mode hebben."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6315,7 +6265,7 @@ msgstr ""
 "hebt isgelezen of niet. Let wel op: dit werkt alleen met nicks,\n"
 "niet met kanalen."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6330,7 +6280,7 @@ msgstr ""
 "\n"
 "Gelimiteerd tot degenen met stichter-rechten op het kanaal."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6340,16 +6290,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6366,7 +6329,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password"
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6378,7 +6341,7 @@ msgstr ""
 "set van restricties op de services toe te passen tijdens een\n"
 "aanval op het netwerk."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6401,7 +6364,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot HOPs of degenen met niveau\n"
 "4 of hoger voor het halfop status geven van zichzelf."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6412,7 +6375,7 @@ msgstr ""
 "Verwijdert de vhost die toegewezen is aan de gegeven nick\n"
 "uit de database."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6449,7 +6412,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Verwijdert de memo's genummerd 2 t/m 5 en 7 t/m 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6460,7 +6423,7 @@ msgstr ""
 "Verwijderd de vhost voor alle nick's in dezelfde groep\n"
 "als de gegeven nick."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6481,7 +6444,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
 "5 of hoger op het kanaal."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6501,7 +6464,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
 "5 of hoger op het kanaal."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6522,7 +6485,7 @@ msgstr ""
 "degenen met een niveau van 10 of hoger op het kanaal voor\n"
 "zelf-protectie."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6545,7 +6508,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot VOPs of degenen met niveau\n"
 "3 of hoger voor het voice status geven van zichzelf."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6557,7 +6520,7 @@ msgstr ""
 "Heft de registratie van het gegeven kanaal op. Kan alleen\n"
 "gebruik wordt door de kanaalstichter."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6570,8 +6533,8 @@ msgstr ""
 "Services Operators kunnen elk kanaal droppen, ook al zijn\n"
 "ze niet voor het betreffende kanaal geindtificeerd."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6600,7 +6563,7 @@ msgstr ""
 "Om dit commando te kunnen gebruiken moet je je eerst identificeren\n"
 "met je wachtwoord. (/msg %s HELP IDENTIFY voor meer informatie)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6623,7 +6586,7 @@ msgstr ""
 "ongedaan maken zonder speciale privileges. Het verwijderen\n"
 "van elke nick is gelimiteerd tot Services Operators."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6708,7 +6671,7 @@ msgstr ""
 "lijsten en breed overeenkomende uitzondering-masks zullen\n"
 "zeer waarschijnlijk de prestaties van de services verminderen."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6725,7 +6688,7 @@ msgstr ""
 "\n"
 "Reden kan verplicht zijn op sommige netwerken."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6742,7 +6705,7 @@ msgstr ""
 "\n"
 "Op sommige netwerken is een reden verplicht."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6759,7 +6722,7 @@ msgstr ""
 "die dit commando uitvoerde samen met de emailhost waarop\n"
 "het werd gebruikt. "
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6769,7 +6732,7 @@ msgstr ""
 "\n"
 "Geef de key van het gegeven kanaal terug."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6789,7 +6752,7 @@ msgstr ""
 "\n"
 "Dit commando is onbeschikbaar wanneer encryptie is ingeschakeld."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6820,7 +6783,7 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6830,7 +6793,7 @@ msgstr ""
 "\n"
 "Geeft alle nicks in je groep weer."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6865,7 +6828,7 @@ msgstr ""
 "naar alle gebruikers op het netwerk. Berichten zullen \n"
 "verstuurd worden vanaf de nick %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6879,7 +6842,8 @@ msgstr ""
 "HUIDIGE nick de vhost van alle nicks in de zelfde groep te\n"
 "laten zijn."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6944,7 +6908,7 @@ msgstr ""
 "\n"
 "Opmerking: alle nicks in een groep hebben hetzelfde wachtwoord."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6965,7 +6929,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot HOPs of degenen met niveau\n"
 "4 of hoger voor het halfop status geven van zichzelf."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -6994,16 +6958,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Gebruik: HOP kanaal ADD nick\n"
 "         HOP kanaal DEL {nick | entry-nr | lijst}\n"
@@ -7043,7 +6997,7 @@ msgstr ""
 "lijsten, en /msg %s HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7061,7 +7015,7 @@ msgstr ""
 "voordat je ze gebruikt. Het wachtwoord moet hetzelfde zijn als\n"
 "die je gestuurd hebt met het REGISTER commando."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7071,7 +7025,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7105,7 +7059,7 @@ msgstr ""
 "IRC Operators zullen niet genegeerd worden, zelfs al komen\n"
 "ze overeen met een mask uit de lijst."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7126,7 +7080,7 @@ msgstr ""
 "Standaard is de ALL optie gelimiteerd tot degenen met\n"
 "stichter-toegang tot het kanaal."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7143,7 +7097,7 @@ msgstr ""
 "commando is gegeven zal je alle informatie te zien krijgen,\n"
 "om het verborgen is of niet."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7159,7 +7113,7 @@ msgstr ""
 "totaal kan ontvangen. Met een paramenter wordt dezelfde\n"
 "informatie voor het gegeven kanaal weergegeven."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7186,7 +7140,7 @@ msgstr ""
 "gegeven nick weergegeven. Dit gebruik is gelimiteerd tot\n"
 "Services Operators."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7205,7 +7159,7 @@ msgstr ""
 "je informatie over een bot, bijvoorbeeld de tijd waarop deze\n"
 "gemaakt is of op hoeveel kanalen deze is."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7247,7 +7201,7 @@ msgstr ""
 "informatie veld de text \"Juped by <nick>\" bevatten, waar\n"
 "<nick> vervangen wordt door de <nick> die de server JUPEt."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7263,7 +7217,8 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7289,7 +7244,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7309,8 +7264,8 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7378,7 +7333,7 @@ msgstr ""
 "*** Gebruiker has been kicked off channel #mijn_kanaal by %s (IRCOp "
 "(Misbruik))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7396,7 +7351,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7412,7 +7367,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7440,7 +7395,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7457,7 +7412,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7480,7 +7435,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7496,7 +7451,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7515,7 +7470,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7534,7 +7489,7 @@ msgstr ""
 "worden voordat deze gebanned wordt. Geef geen ttb op om het\n"
 "ban system uit te schakelen als deze kicker geactiveerd is."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7587,7 +7542,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7607,7 +7562,7 @@ msgstr ""
 "worden weergegeven. LET OP: er is momenteel geen flood-\n"
 "bescherming voor grote databases."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7622,7 +7577,7 @@ msgstr ""
 "met het trefbeeld. (Kanalen met de PRIVATE optie aan\n"
 "worden niet weergegeven.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7661,7 +7616,7 @@ msgstr ""
 "    LIST *!*@*.bar.org\n"
 "        Geeft alle nicks weer van het bar.org domein"
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7721,7 +7676,7 @@ msgstr ""
 "        Geeft alle geregistreerde nicks weer die niet\n"
 "        zullen verlopen."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7743,11 +7698,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Geeft de memo's genummerd 2 t/m 5 en 7 t/m 9 weer."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Gebruik: LOGONNEWS ADD text"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7781,7 +7746,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Gebruik: LOGONNEWS DEL {nr | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7797,7 +7762,7 @@ msgstr ""
 "eigenaar van de nick. Merk op dat je niet gevraagd wordt om\n"
 "je opnieuw te identificeren."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7821,22 +7786,7 @@ msgstr ""
 "Services de gegeven nick vragen opnieuw te identificeren.\n"
 "Het gebruik hiervan is gelimiteerd tot Services Operators."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Gebruik: MODE kanaal modes\n"
-"\n"
-"Stelt Services operators in staat om de modes van elk willekeurig\n"
-"kanaal in te stellen. De paramenters zijn het zelfde als bij een\n"
-"standaard /MODE commando."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7863,7 +7813,22 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Gebruik: MODE kanaal modes\n"
+"\n"
+"Stelt Services operators in staat om de modes van elk willekeurig\n"
+"kanaal in te stellen. De paramenters zijn het zelfde als bij een\n"
+"standaard /MODE commando."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7873,7 +7838,7 @@ msgstr ""
 "Dit command geeft informatie weer over de gespecificeerde\n"
 "geladen module."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7882,7 +7847,7 @@ msgstr ""
 "Gebruik: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Geeft alle momenteel geladen modules weer."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7894,7 +7859,7 @@ msgstr ""
 "Dit commando laadt de module genaamd bestandsnaam uit de\n"
 "modules directory."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7906,7 +7871,7 @@ msgstr ""
 "Dit commando laadt de module genaamd bestandsnaam uit de\n"
 "modules directory."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7917,7 +7882,7 @@ msgstr ""
 "Dit commando ontlaadt de module genaamd bestandsnaam uit\n"
 "de modules directory."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7945,7 +7910,7 @@ msgstr ""
 "\n"
 "Pas op: De server wordt niet gecontroleerd door Services."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7959,7 +7924,7 @@ msgstr ""
 "gebruiker die een /whois op je doet je echte hostname zien\n"
 "in plaats van je vhost."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -7974,7 +7939,7 @@ msgstr ""
 "gegeaan door een \"+\" of een \"-\". Om alle flags te verwijderen\n"
 "kun je simpelweg een \"-\" typen in plaats van de flags."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -7988,7 +7953,7 @@ msgstr ""
 "gebruiker die een /whois op je doet de vhost zien in plaats\n"
 "van je echte hostname."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8012,7 +7977,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Gebruik: OPERNEWS ADD text"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8046,7 +8011,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Gebruik: OPERNEWS DEL {nr | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8065,7 +8030,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met niveau\n"
 "5 of hoger op het kanaal."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8086,7 +8051,7 @@ msgstr ""
 "degenen met een niveau van 10 of hoger op het kanaal voor\n"
 "zelf-protectie."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8115,16 +8080,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8163,7 +8118,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8185,7 +8140,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Gebruik: RANDOMNEWS ADD text"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8213,7 +8168,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Gebruik: RANDOMNEWS DEL {nr | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8238,7 +8193,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Geeft de memo's genummerd 2 t/m 5 en 7 t/m 9 weer."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8285,8 +8241,8 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8328,8 +8284,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8394,7 +8350,7 @@ msgstr ""
 "memos en dezelfde kanaalrechten te delen. Voor meer informatie\n"
 "over deze functie, type /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8423,7 +8379,7 @@ msgstr ""
 "van deze nick zijn, je geindentificeerd zijn in de group van\n"
 "die nick, of het correcte wachtwoord opgegeven zijn."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8438,7 +8394,7 @@ msgstr ""
 "vereisen dat de Services opnieuw gestart worden (bijvoorbeeld\n"
 "Services' nicknames, activatie van de sessie limiet, etc.)"
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8450,7 +8406,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8473,7 +8429,7 @@ msgstr ""
 "Zorgt ervoor dat Services alle databases opslaat en dan\n"
 "opnieuw opstart."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8496,7 +8452,7 @@ msgstr ""
 "een memo teruggestuurd worden naar degene die de memo verstuurd\n"
 "heeft om hem/haar te informeren dat de memo gelezen is."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8507,7 +8463,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8522,7 +8478,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8534,7 +8490,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8544,7 +8500,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8560,7 +8516,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8583,7 +8539,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8616,24 +8572,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8647,7 +8586,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8659,7 +8598,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8670,7 +8609,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8689,7 +8628,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8712,7 +8651,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8722,7 +8661,7 @@ msgstr ""
 "\n"
 "Laat de bot de gegeven tekst op het gegeven kanaal zeggen."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8739,7 +8678,7 @@ msgstr ""
 "de ontvanger een notice krijgen dat hij/zij een nieuwe memo\n"
 "heeft. De doel nick/kanaal moet geregistreerd zijn."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8750,7 +8689,7 @@ msgstr ""
 "Stuurt alle geregistreerde gebruikers een memo die\n"
 "memo-text bevat."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8768,7 +8707,7 @@ msgstr ""
 "\n"
 "Kan gelimiteerd zijn tot IRC operators op sommige netwerken."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8802,7 +8741,7 @@ msgstr ""
 "limiteringen en hoe sessie limieten in te stellen voor\n"
 "specifieken hosts en groepen daarvan."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8817,7 +8756,7 @@ msgstr ""
 "ook SET <nick> <ident>@<hostmask> gebruiken om de ident\n"
 "voor een gebruiker aan te passen gelijk met de hostname."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8832,8 +8771,8 @@ msgstr ""
 "Wanneer veilige ops aan staat mogen gebruikers die niet\n"
 "op de toegangslijst staan geen kanaalop status krijgen."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8858,26 +8797,9 @@ msgstr ""
 "hun nick niet toegevoegd hebben aan de kicks.\n"
 "Zie /msg %s HELP LEVELS voor meer informatie."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Gebruik: %s kanaal TOPICLOCK {ON | OFF}\n"
-"\n"
-"Zet de topicslot optie aan of uit voor een kanaal.\n"
-"Wanneer topicslot aan staat zal %s het niet toestaan om\n"
-"het topic van het kanaal te veranderen. Het topic kan dan\n"
-"alleen veranderd worden met het TOPIC commando."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8911,7 +8833,7 @@ msgstr ""
 "Let op: toegang tot dit commando wordt geregeld via het\n"
 "niveau SET commando."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8923,7 +8845,7 @@ msgstr ""
 "toegewezen aan een kanaal door gebruikers die geen\n"
 "IRC operator zijn."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8939,7 +8861,7 @@ msgstr ""
 "\n"
 "Beschikbare opties:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8954,7 +8876,7 @@ msgstr ""
 "gekicked worden, zelfs wanneer deze niet overeen komen\n"
 "met het NOKICK niveau."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -8969,7 +8891,7 @@ msgstr ""
 "gekicked worden, zelfs wanneer deze niet overeen komen\n"
 "met het NOKICK niveau."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9001,7 +8923,7 @@ msgstr ""
 "Bijvoorbeeld: om !op te mogen gebruiken moet een gebruiken\n"
 "genoeg rechten voor het OPDEOP niveau hebben."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9017,7 +8939,7 @@ msgstr ""
 "van de gebruikers die het kanaal joinen weergegeven, mits\n"
 "ze hiertoe rechten hebben op het kanaal."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9032,7 +8954,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9047,7 +8969,7 @@ msgstr ""
 "automatisch van het kanaal gehaald wanneer je deze optie\n"
 "aan zet."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9059,7 +8981,7 @@ msgstr ""
 "Stelt in of het gegeven kanaal zal verlopen. Door deze optie\n"
 "AAN te zetten kun je verhinderen dan het kanaal verloopt."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9076,8 +8998,8 @@ msgstr ""
 "foor %s wordt gedaan bij kanalen, zoals MODEs, KICKs, en\n"
 "zelfs het welkomstbericht."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9103,7 +9025,7 @@ msgstr ""
 "Type /msg %s HELP SET optie voor more informatie over\n"
 "een specifieke optie."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9113,7 +9035,7 @@ msgstr ""
 "\n"
 "Stelt verscheidene nick opties in.  option kan zijn:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9137,7 +9059,7 @@ msgstr ""
 "    IGNORE     Activate or deactivate ignore mode\n"
 "    LIST       List the options"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9149,7 +9071,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9161,7 +9083,7 @@ msgstr ""
 "Verandert de weergegeven nick van je nick-groep in Services.\n"
 "De nieuwe weergave MOET een nick in je groep zijn."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9175,7 +9097,7 @@ msgstr ""
 "zal worden weergegeven wanneer iemand informatie over je nick\n"
 "opvraagt met het INFO commando."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9190,7 +9112,7 @@ msgstr ""
 "elk kanaal dat je joint waarbij de GREET optie aanstaat,\n"
 "indien je toegangsniveau hoog genoeg is hiervoor."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9212,7 +9134,7 @@ msgstr ""
 "verbergen. De tweede paramenter geeft aan of de informatie\n"
 "moet worden weergegeven (OFF) of verborgen (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9246,7 +9168,7 @@ msgstr ""
 "Deze optie kan ook uitgeschakeld zijn door de netwerk\n"
 "administrators."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9263,7 +9185,7 @@ msgstr ""
 "op een commando dat je hebt verzonden). nummer moet gekozen\n"
 "worden uit de volgende lijst van ondersteunde talen:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9280,7 +9202,7 @@ msgstr ""
 "naar je kunnen sturen. Je kan dit echter niet hoger dan %d\n"
 "zetten."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9322,7 +9244,7 @@ msgstr ""
 "instellen, mogen geen limiet instellen boven %d, en mogen geen\n"
 "harde limiet instellen."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9332,7 +9254,7 @@ msgstr ""
 "\n"
 "Geef de verschillende %s instellingen weer."
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9346,7 +9268,7 @@ msgstr ""
 "met je communiceren. Met MSG aan zullen de Services gewone\n"
 "berichten gebruiken, anders zullen ze notices gebruiken."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9364,7 +9286,7 @@ msgstr ""
 "\n"
 "Deze optie komt overeen met de commandline-optie -noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9401,7 +9323,7 @@ msgstr ""
 "\n"
 "ON is wezenlijk LOGON en NEW gecombineerd."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9413,7 +9335,7 @@ msgstr ""
 "Verandert het wachtwoord dat je gebruik om je te identificeren\n"
 "als de eigenaar van je nick."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9432,7 +9354,7 @@ msgstr ""
 "iedereen die je nick weet kan nog steeds informatie krijgen\n"
 "mbv het INFO commando."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9462,7 +9384,7 @@ msgstr ""
 "\n"
 "Deze optie komt overeen met de commandline-optie -readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9485,7 +9407,7 @@ msgstr ""
 "%s je niet automatisch killen, hoe de KILL optie ook\n"
 "ingesteld is."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9502,7 +9424,7 @@ msgstr ""
 "wanneer het echt nodig is, en terug op OFF gezet worden als het\n"
 "niet meer nodig is."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9523,7 +9445,7 @@ msgstr ""
 "* LET OP, dit wijzigt niet de vhost voor elke nick lid\n"
 "wordt van de groep nadat dit commando is gebruikt."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9534,7 +9456,7 @@ msgstr ""
 "Zorgt ervoor dat Services alle databases opslaat en dan\n"
 "afsluit."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9624,7 +9546,7 @@ msgstr ""
 "\n"
 "SNLINE CLEAR maakt de SNLINE lijst leeg."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9654,16 +9576,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Gebruik: SOP kanaal ADD nick\n"
 "         SOP kanaal DEL {nick | entry-nr | lijst}\n"
@@ -9705,7 +9617,7 @@ msgstr ""
 "lijsten, en /msg %s HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9798,7 +9710,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR maakt de SQLINE lijst leeg."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9808,7 +9720,7 @@ msgstr ""
 "Geeft de nicks van alle Services Staff samen met\n"
 "hun level en on-line status weer."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9819,7 +9731,7 @@ msgstr ""
 "\n"
 "Sends all services staff a memo containing memo-text."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9863,7 +9775,7 @@ msgstr ""
 "De ALL optie stelt momenteel het maximum aantal gebruikers in\n"
 "op het aantal gebruikers dat momenteel aanwezig is op het netwerk."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9887,7 +9799,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR fout-bericht"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9931,7 +9843,7 @@ msgstr ""
 "de rest wordt genegeerd. If no nickname is given, your status\n"
 "will be returned."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9950,7 +9862,7 @@ msgstr ""
 "\n"
 "Op sommige netwerken is een reden verplicht."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -9959,7 +9871,7 @@ msgstr ""
 "Gebruik: SVSNICK nick nieuwe nick\n"
 "Veranderd een gebruiker's nick van nick naar nieuwe nick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10045,7 +9957,8 @@ msgstr ""
 "\n"
 "SZLINE CLEAR maakt de SZLINE lijst leeg"
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10069,21 +9982,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot degenen met stichter-toegang\n"
 "op het kanaal."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Gebruik: UMODE gebruiker modes\n"
-"\n"
-"Stelt Services Operators in staat gebruikersmodes van\n"
-"elke willekeurige gebruiker in te stellen. De paramenters\n"
-"zijn hetzelfde als van een standaard /MODE commando."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10101,7 +10000,7 @@ msgstr ""
 "zodat je later de bot altijd opnieuw aan het kanaal kun\n"
 "toewijzen zonder dat je deze opnieuw hoeft te configureren."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10120,7 +10019,7 @@ msgstr ""
 "Standaard is dit gelimiteerd tot AOPs of degenen met\n"
 "niveau 5 of hoger op het kanaal."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10137,7 +10036,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10152,7 +10051,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspention."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10164,7 +10063,7 @@ msgstr ""
 "Zorgt ervoor dat Services de database bestanden op de harde\n"
 "schijf bijwerken zodra je dit commando vertsuurt."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10188,7 +10087,7 @@ msgstr ""
 "weergegeven. Als INVISBLE is gespecifificeerd worden alleen\n"
 "gebruikers met gebruikersmode +i weergegeven."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10210,7 +10109,7 @@ msgstr ""
 "5 of hoger op het kanaal, of tot VOPs of degenen met niveau\n"
 "3 of hoger voor het voice status geven van zichzelf."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10239,16 +10138,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Gebruik: VOP kanaal ADD nick\n"
 "         VOP kanaal DEL {nick | entry-nr | lijst}\n"
@@ -10289,7 +10178,7 @@ msgstr ""
 "lijsten, en /msg %s HELP SET XOP om te weten te komen\n"
 "hoe je tussen toegangslijsten en xOP-lijsten schakelt."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10305,7 +10194,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10314,7 +10203,7 @@ msgstr ""
 "Stelt een nick tijdelijk buiten werking. Een nick die buiten werking\n"
 "is gesteld kan niet worden gebruikt: identificatie wordt uitgeschakeld."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10322,7 +10211,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10335,51 +10224,96 @@ msgstr ""
 "memo's, stelt de benodigde kanaalmodes in (ModeonID), en\n"
 "werkt je vhost en gebruikersflags bij (laatstgezien, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kanaal [topic]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Verwijder tijdelijk alle O:regels van een server\n"
+"                op afstand"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Sla databases op en sluit Services af"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Sluit Services af zonder databases op te slaan"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "De IMMED optie is niet beschikbaar op dit netwerk."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "De AKILL lijst is leeggemaakt."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Het Defcon niveau staat nu op niveau: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "De SNLINE lijst is leeggemaakt."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "The SQLINE lijst is leeggemaakt."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "The SZLINE lijst is leeggemaakt."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10390,90 +10324,80 @@ msgstr ""
 "de niveaus voor AUTODEOP en NOJOIN maximale niveaus zijn,\n"
 "terwijl alle andere minimale niveaus zijn."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "De host %s heeft momenteel %d sessies met een limiet van %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "De laatste memo die je naar %s gestuurd hebt (op %s) is gelezen."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "De laatste memo die je naar %s gestuurd hebt (op %s) is nog niet gelezen."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "De memo limiet voor %s mag niet worden veranderd."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "De nieuwe weergave is nu %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "De nick %s wordt nu veranderd in %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Er zijn %d memo's op kanaal %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10481,7 +10405,8 @@ msgstr ""
 "Er zijn momenteel geen bots beschikbaar.\n"
 "Vraag een Services beheerder er een te maken!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10491,20 +10416,12 @@ msgstr ""
 "Type /msg %s HELP GLIST en/msg %s HELP DROP \n"
 "voor meer informatie."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Er is %d memo op kanaal %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Er is een nieuwe memo op kanaal %s.\n"
-"Type /msg %s READ %s %d om deze te lezen."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Er is geen bot meer toegewezen aan %s."
@@ -10525,7 +10442,7 @@ msgstr "Er is geen willekeurig nieuws."
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10541,83 +10458,38 @@ msgstr ""
 "    PRIVATE          Zorg dat een bot alleen door IRC operators\n"
 "                        kan worden toegevoegd"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Dit kanaal is verboden."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Dit kanaal is geregistreerd met %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Dit kanaal is tijdelijk buiten werking gesteld."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Dit kanaal mag niet gebruikt worden."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Dit kanaal zal niet verlopen."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Deze nick is al aangevraagd. Controleer je e-mail adres voor een "
-"verificatiecode."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Deze nick wacht nog op een e-mail verificatie code coor de registratie is "
-"voltooid."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Deze nick is eigendom van iemand anders.  Kies een andere.\n"
-"(Als dit jouw nick is, type /msg %s IDENTIFY wachtwoord.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Deze nickname is geregistreerd; je mag hem niet gebruiken."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Deze nick is tijdelijk buiten werking gesteld"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Deze nick is tijdelijk buiten werking gesteld, reden: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Deze nickname is geregistreerd en beschermd.  Als het jouw\n"
-"nick is, type /msg %s IDENTIFY wachtwoord.  Zo niet,\n"
-"kies een andere nick."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Deze nick zal niet verlopen."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Deze nickname mag niet gebruikt worden.  Kies een andere."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Deze nick zal niet verlopen."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10626,30 +10498,60 @@ msgstr ""
 "worden naar de kanaalnaam zonder het #-teken ervoor (anope\n"
 "in plaats van #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Schakel het gebruikersprivilegesysteem om"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Topicslot"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Topicbehoud"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Topic kan alleen veranderd worden met TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now off."
+msgstr "Topic lock option for %s is now ON."
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr "Topic lock option for %s is now ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr "Topic retention option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Topic retention option for %s is now ON."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Zet caps lock UIT!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Zet nickname beveiliging aan of uit"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Zet bescherming aan of uit"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10664,7 +10566,8 @@ msgstr ""
 "    10 de kanaalmemo's lezen. Dit kan aangepast worden met\n"
 "    het %s LEVELS commando."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10674,7 +10577,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10682,7 +10586,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10690,130 +10595,130 @@ msgstr ""
 "Type /msg %s HELP option voor meer informatie over een\n"
 "specifieke optie."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Type /msg %s SET EMAIL e-mail om je e-mail in te stellen.\n"
-"Je privacy wordt gerespecteerd; deze e-mail wordt niet aan\n"
-"een derde partij doorgegeven."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Type /msg %s LIST NEW om ze weer te geven."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Type /msg %s READ %d om deze te lezen."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Type /msg %s READ LAST om deze te lezen."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modes"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Type /msg %s SET EMAIL e-mail om je e-mail in te stellen.\n"
+"Je privacy wordt gerespecteerd; deze e-mail wordt niet aan\n"
+"een derde partij doorgegeven."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kanaal"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kanaal [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND kanaal"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Ontlaad een module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Laden van de module %s is gefaald"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Het verwijderen van module %s is gefaald"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Onbekende SET optie %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Onbekende STATS optie %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Onbekend commando %s.  \"/msg %s HELP\" voor help."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Onbekend mode karakter %c genegeerd."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Onbekende optie %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Onbekende optie %s.\n"
-"Type /msg %s HELP SET voor meer informatie."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Bijwerken databases."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Gebruiker     : %6d records, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"Gebruiker die je nick claimde is gekilld.\n"
-"/msg %s RELEASE %s om deze voor de %s timeout terug te krijgen."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "Gebruiker komt overeen met kanaal-uitzondering."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10821,16 +10726,35 @@ msgstr ""
 "Gebruikers lijst:\n"
 "Nick                 Mask"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Stichter van kanaal %s veranderd in %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Bekijk de lijst met sessies per host"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Voices bescherming"
 
@@ -10857,16 +10781,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Let op je taal!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Je bent al lid van de group van %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Je bent al geidentificeerd."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10875,11 +10799,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Je bent geen SuperAdministrator meer"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Je hebt geen toestemming om op dit kanaal te zijn."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Je het geen toestemming je memo limiet te veranderen."
 
@@ -10887,11 +10807,12 @@ msgstr "Je het geen toestemming je memo limiet te veranderen."
 msgid "You are now a SuperAdmin"
 msgstr "Je bent nu een SuperAdministrator"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Je bent nu een IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10899,43 +10820,44 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Je zit nu in de group van %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Je kan geen ontvangstbevestiging aanvragen voor een\n"
 "memo die je naar jezelf stuurt."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Je kan jezelf niet ghosten!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Kan %s niet uitloggen omdat hij een service administrator is."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Je kan jezelf niet herstellen!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10945,7 +10867,8 @@ msgstr ""
 "Gebruik de AOP, SOP en VOP commando's in plaats van deze.\n"
 "Type /msg %s HELP command voor meer informatie."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10956,6 +10879,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -10963,56 +10887,66 @@ msgstr ""
 "Je kan dit commando niet gebruiken. Gebruik het ACCESS commando.\n"
 "Type /msg %s HELP ACCESS voor meer informatie."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Je kan de memo limiet voor %s niet hoger dan %d zetten."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Je kan je memo limiet niet hoger dan %d zetten."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Je kan je e-mail adres niet verwijderen op dit netwerk."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Je hebt momenteel %d memo's, waarvan er %d ongelezen zijn."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Je hebt momenteel %d memo's, waarven er 1 ongelezen is."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Je hebt momenteel %d memo's."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Je hebt momenteel %d memo's; allemaal zijn ze ongelezen."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Je hebt momenteel 1 memo, en deze is nog niet gelezen."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Je hebt momenteel 1 memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Je hebt momenteel geen memo's."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11022,62 +10956,43 @@ msgstr "Je hebt %d nieuwe memo's."
 msgid "You have 1 new memo."
 msgstr "Je hebt 1 nieuwe memo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Je hebt een nieuwe memo van %s.\n"
-"Type /msg %s READ %d om deze te lezen."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Bans met betrekking tot jou op %s zijn opgeheven."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Er staat geen limiet op het aantal memo's dat je mag hebben."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Je hebt geen memo's."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Je hebt geen nieuwe memo's."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Je moet een geldig nummer als tijd invoeren."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Je moet een bot aan een kanaal toewijzen voordat je dit commando gebruikt.\n"
-"Type /msg %s HELP ASSIGN voor meer informatie."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Je moet een operator zijn op het kanaal om deze te registreren."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Je moet een operator zijn op het kanaal om deze te registreren."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11087,25 +11002,25 @@ msgstr ""
 "Dit stelt je in staat je wachtwoord terug te halen in\n"
 "het geval dat je het vergeet."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Je wordt geinformeerd over nieuwe memo's wanneer je inlogt en wanneer deze "
 "arriveren."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Je wordt geinformeerd over nieuwe memo's wanneer je inlogt."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Je wordt geinformeerd over nieuwe memo's wanneer deze arriveren."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Je kan niet langer memo's ontvangen."
 
@@ -11113,7 +11028,7 @@ msgstr "Je kan niet langer memo's ontvangen."
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Je wordt niet geinformeerd over nieuwe memo's."
 
@@ -11121,18 +11036,20 @@ msgstr "Je wordt niet geinformeerd over nieuwe memo's."
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Je IRCD ondersteunt geen vIdent's. Als dit niet klopt, rapporteer dit dan "
-"als een mogelijke bug"
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Je bent al geidentificeerd."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11148,35 +11065,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Your access list is empty."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Alle O:lines van %s zijn verwijderd."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Negeer-lijst is leeg."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Je memo limiet is uitgeschakeld."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Je memo limiet is veranderd in %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Je memo limiet is %d, en mag niet worden veranderd."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Je memo limiet is %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Je memo limiet is 0; Je zal geen memo's ontvangen."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11184,62 +11122,57 @@ msgstr ""
 "Je memo limiet is 0; Je zal geen memo's ontvangen.  Je kan deze limiet niet "
 "veranderen."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Je nick is uitgelogd."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Je nick is al geregistreerd; type eerst /msg %s DROP."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Je nick is niet geregistreerd."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Je nickname is gedropped."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Je nickname wordt nu veranderd in %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Je toegangscode is opnieuw gestuurd naar %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Je wachtwoord is %s - onthoudt dit voor later gebruik."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr ""
-"Je wachtwoord is te lang. Probeer het opnieuw met een korter wachtwoord."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Je vhost van %s is nu geactiveerd."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Je vhost van %s@%s is nu geactiveerd."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11258,94 +11191,95 @@ msgstr "[Oper Nieuws - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Willekeurig Nieuws - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "verloopt niet"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "verloopt bij de volgende database update"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "verloopt over %d dag"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "verloopt over %d dagen"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "verloopt over %d uur, %d minuut"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "verloopt over %d uur, %d minuten"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "verloopt over %d uur, %d minuut"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "verloopt over %d uur, %d minuten"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "verloopt over %d minuut"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "verloopt over %d minuten"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost voor %s verwijderd."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost voor %s gezet op %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost voor %s gezet op %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost voor groep %s gezet op %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost voor groep %s gezet op %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts voor group %s zijn verwijderd."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "xOP lijsten systeem"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now off."
+msgstr "xOP lists system for %s is now ON."
+
+#: modules/core/cs_set_xop.cpp:71
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now on."
 msgstr "xOP lists system for %s is now ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11354,557 +11288,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | kanaal} memo-text"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s toegevoegd aan %s AOP lijst."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s toegevoegd aan %s HOP lijst."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s toegevoegd aan %s SOP lijst."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s toegevoegd aan %s VOP lijst."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s verwijderd van %s HOP lijst."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s verwijderd van %s SOP lijst."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s verwijderd van %s VOP lijst."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s verplaatst naar %s HOP lijst."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s verplaatst naar %s SOP lijst."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s verplaatst %s VOP lijst."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s niet gevonden op %s HOP lijst."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s niet gevonden op %s SOP lijst."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s niet gevonden op %s VOP lijst."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Zorgt ervoor dat je nick niet verschijnt in een\n"
-#~ "                   /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d dagen"
-
-#~ msgid "%d hours"
-#~ msgstr "%d uren"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minuten"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d secondes"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "%s HOP lijst is leeg."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "%s SOP lijst is leeg."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "%s VOP lijst is empty."
-
-#~ msgid "1 day"
-#~ msgstr "1 dag"
-
-#~ msgid "1 hour"
-#~ msgstr "1 uur"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minuut"
-
-#~ msgid "1 second"
-#~ msgstr "1 seconde"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Toegestaan om CLEAR te gebruiken"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Toegestaan om HALFOP/DEHALFOP te gebruiken"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Kanaal %s HOP lijst is leeggemaakt."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Kanaal %s SOP lijst is leeggemaakt."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Kanaal %s VOP lijst is leeggemaakt."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "%d HOPs verwijderd van de %s HOP lijst."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "%d SOPs verwijderd van %s SOP lijst."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "%d VOPs verwijderd van %s VOP lijst."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "1 HOP verwijderd van de %s HOP lijst."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "1 SOP verwijderd van %s SOP lijst."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "1 VOP verwijderd van %s VOP lijst."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "E-mail adres verwijderd."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP kanaal {ADD|DEL|LIST|CLEAR} [nick | lijst]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Einde van gebruikers lijst."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Welkomstbericht voor %s verwijderd."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Bot is niet in kanaal %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr " Toegangsbericht: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Access list for %s is empty."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Toegangslijst voor %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Welkomstbericht voor %s veranderd."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Fantasie mode staat nu UIT op kanaal %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Begroetingsmode staat nu UIT op kanaal %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "HOP lijst voor %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators.\t"
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Interne fout - onmogelijk om aanvraag af te handelen."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Login nieuwsbericht #%d verwijderd."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nickname Registratie (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Nick wachtwoord (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Geen # gevonden aan het begin van de kanaalnaam."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Geen Bot mode staat nu UIT op kanaal %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Geen overeenkomsten op %s HOP lijst."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Geen overeenkomsten op %s SOP lijst."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Geen overeenkomsten op %s VOP lijst."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "#%d bestaat niet op %s AOP lijst."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "#%d bestaat niet op %s HOP lijst."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "#%d bestaat niet op %s SOP lijst."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "#%d bestaat niet op %s VOP lijst."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice option for %s is now OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace option for %s is now OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr "Wacht %d seconden voor het opnieuw gebruiken van het SEND commando."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Prive mode van bot %s staat nu UIT."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private option for %s is now OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Protectie staat nu AAN, zonder vertraging."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER wachtwoord [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Restricted access option for %s is now OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "SOP lijst voor %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s not registered"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND kanaal [reden]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure founder option for %s is now OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure ops option for %s is now OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure option for %s is now OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Services kan geen modes veranderen.  Zijn je server goed geconfigureerd?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Services draaien %d dagen, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Services draaien %d uur, %d minuut"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Services draaien %d uur, %d minuten"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Services draaien %d uur, %d minuut"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Services draaien %d minuut, %d seconde"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Services draaien %d minuut, %d seconden"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Services draaien %d minuten, %d seconde"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signed kick option for %s is now OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Sorry, kanaal HOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Sorry, kanaal SOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Sorry, kanaal VOP lijst wijzigen is tijdelijk uitgeschakeld."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Sorry, je kan maar %d AOPs/SOPs/VOPs in dit kanaal hebben."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Symbiose mode staat nu UIT op kanaal %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Gebruik: RANDOMNEWS ADD text"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR kanaal wat"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Gebruik: OPERNEWS ADD text"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "GEBRUIK: SET DEBUG {ON | OFF | nummer}\n"
-#~ "\n"
-#~ "Zet debug mode aan of uit. In debug mode zal alle data die\n"
-#~ "naar en van Services verzonden worden, alsmede een aantal\n"
-#~ "debug-berichten, naar het log-bestand geschreven worden.\n"
-#~ "Als nummer is gegeven zal debug mode worden geactiveerd met\n"
-#~ "het debug-niveau op nummer\n"
-#~ "Deze optie komt overeen met de commandline-optie -debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Gebruik: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic lock option for %s is now OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Topic retention option for %s is now OFF."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Onbekend commando %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Onbekende optie %s.\n"
-#~ "Type /msg %s HELP KICK voor meer informatie."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "Gebruiker %s niet gevonden in de nickserv database."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "VOP lijst for %s:\n"
-#~ "  Num  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Bot %s is verwijderd."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Laatste memo naar %s is ge-annuleerd."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Je vhost van %s is nu geactiveerd."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Bot %s is verwijderd."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "xOP lists system for %s is now OFF."
diff --git a/language/anope.pl_PL.po b/language/anope.pl_PL.po
index d8a3c1db5..4edd35c23 100644
--- a/language/anope.pl_PL.po
+++ b/language/anope.pl_PL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 20:57-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Polish\n"
@@ -16,98 +16,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "Napisz /msg %s HELP %s aby uzyskaæ wiêcej informacji."
-
-#: modules/core/ns_help.cpp:33
-msgid ""
-"%s allows you to \"register\" a nickname and\n"
-"prevent others from using it. The following\n"
-"commands allow for registration and maintenance of\n"
-"nicknames; to use them, type %s%s command.\n"
-"For more information on a specific command, type\n"
-"%s%s HELP command."
-msgstr ""
-"%s umo¿liwia rejestracjê nicka i zapewnia\n"
-"wy³±czno¶æ na jego u¿ywanie. Poni¿sze komendy\n"
-"umo¿liwiaj± zarz±dzanie nickiem, aby ich u¿yæ wpisz:\n"
-"/msg %s komenda\n"
-"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
-"/msg %s HELP komenda"
-
-#: modules/core/bs_help.cpp:35
-msgid ""
-"%s allows you to have a bot on your own channel.\n"
-"It has been created for users that can't host or\n"
-"configure a bot, or for use on networks that don't\n"
-"allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
-msgstr ""
-"%s pozwala umie¶ciæ bota na w³asnym kanale.\n"
-"Zosta³ stworzony dla u¿ytkowników, którzy nie mog±\n"
-"hostowaæ w³asnego bota oraz dla tych sieci które\n"
-"nie pozwalaj± na ich u¿ywanie. Poni¿sze komendy\n"
-"umo¿liwiaj± zarz±dzanie botem, aby ich u¿yæ wpisz:\n"
-"/msg %s komenda\n"
-"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
-"/msg %s HELP komenda"
-
-#: modules/core/cs_help.cpp:35
-#, fuzzy
-msgid ""
-"%s allows you to register and control various\n"
-"aspects of channels. %s can often prevent\n"
-"malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges. Available\n"
-"commands are listed below; to use them, type\n"
-"%s%s command. For more information on a\n"
-"specific command, type %s%s HELP command."
-msgstr ""
-"%s umo¿liwia rejestracjê kana³u, zmianê\n"
-"jego ustawieñ oraz zapobiega przed odebraniem\n"
-"kontroli nad kana³em. Poni¿sze komendy pozwalaj±\n"
-"na zarz±dzanie kana³em, aby ich u¿yæ wpisz:\n"
-"/msg %s komenda\n"
-"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
-"/msg %s HELP komenda"
-
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s umo¿liwia wysy³anie krótkich wiadomo¶ci\n"
-"do innych u¿ytkowników (niezale¿nie od tego czy\n"
-"s± oni w danej chwili na IRCu) lub do kana³ów(*).\n"
-"Aby móc u¿ywaæ tego serwisu nadawca i odbiorca\n"
-"(kana³ lub nick) musz± byæ zarejestrowani.\n"
-"Poni¿sze komendy pozwalaj± na wysy³anie i\n"
-"odbieranie wiadomo¶ci, aby ich u¿yæ wpisz:\n"
-"/msg %s komenda\n"
-"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
-"/msg %s HELP komenda"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s zmieniono poziom DEFCON na %d"
 
-#: modules/core/cs_access.cpp:238
+#: modules/core/cs_access.cpp:244
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 "%s dodano do listy dostêpu kana³u %s z\n"
 "poziomem %d."
 
-#: modules/core/cs_akick.cpp:281
+#: modules/core/cs_akick.cpp:280
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s dodano do listy AKICK kana³u %s."
@@ -142,61 +63,127 @@ msgstr "%s dodano do listy SZLINE."
 msgid "%s added to your access list."
 msgstr "%s dodano do Twojej listy dostêpu."
 
-#: modules/core/ms_ignore.cpp:54
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s dodano do Twojej listy dostêpu."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s dodano do Twojej listy dostêpu."
+
+#: modules/core/ms_ignore.cpp:55
 #, fuzzy, c-format
 msgid "%s added to your ignore list."
 msgstr "%s dodano do Twojej listy dostêpu."
 
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s allows you to \"register\" a nickname and\n"
+"prevent others from using it. The following\n"
+"commands allow for registration and maintenance of\n"
+"nicknames; to use them, type %s%s command.\n"
+"For more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s umo¿liwia rejestracjê nicka i zapewnia\n"
+"wy³±czno¶æ na jego u¿ywanie. Poni¿sze komendy\n"
+"umo¿liwiaj± zarz±dzanie nickiem, aby ich u¿yæ wpisz:\n"
+"/msg %s komenda\n"
+"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
+"/msg %s HELP komenda"
+
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to have a bot on your own channel.\n"
+"It has been created for users that can't host or\n"
+"configure a bot, or for use on networks that don't\n"
+"allow user bots. Available commands are listed \n"
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s pozwala umie¶ciæ bota na w³asnym kanale.\n"
+"Zosta³ stworzony dla u¿ytkowników, którzy nie mog±\n"
+"hostowaæ w³asnego bota oraz dla tych sieci które\n"
+"nie pozwalaj± na ich u¿ywanie. Poni¿sze komendy\n"
+"umo¿liwiaj± zarz±dzanie botem, aby ich u¿yæ wpisz:\n"
+"/msg %s komenda\n"
+"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
+"/msg %s HELP komenda"
+
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to register and control various\n"
+"aspects of channels. %s can often prevent\n"
+"malicious users from \"taking over\" channels by limiting\n"
+"who is allowed channel operator privileges. Available\n"
+"commands are listed below; to use them, type\n"
+"%s%s command. For more information on a\n"
+"specific command, type %s%s HELP command."
+msgstr ""
+"%s umo¿liwia rejestracjê kana³u, zmianê\n"
+"jego ustawieñ oraz zapobiega przed odebraniem\n"
+"kontroli nad kana³em. Poni¿sze komendy pozwalaj±\n"
+"na zarz±dzanie kana³em, aby ich u¿yæ wpisz:\n"
+"/msg %s komenda\n"
+"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
+"/msg %s HELP komenda"
+
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s ju¿ istnieje na li¶cie zakazanych s³ów kana³u %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s ju¿ istnieje w li¶cie AKICK kana³u %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s ju¿ istnieje na li¶cie AKILL."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s ju¿ istnieje na li¶cie wyj±tków."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SNLINE."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SQLINE."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s ju¿ istnieje na li¶cie SZLINE."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s nie mo¿e byæ wziêty jako ilo¶æ wykroczeñ do za³o¿enia bana."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s zmienia Twoje flagi u¿ytkownika."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -210,42 +197,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s usuniêto z listy AOP kana³u %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s usuniêto z listy dostêpu kana³u %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s usuniêto z listy AKICK %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s usuniêto z listy zakazanych s³ów kana³u %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s usuniêto z listy wyj±tków limitów sesji."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s usuniêto z listy AKILL."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s usuniêto z listy SNLINE."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s usuniêto z listy SQLINE."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s usuniêto z listy SZLINE."
@@ -255,70 +242,83 @@ msgstr "%s usuniêto z listy SZLINE."
 msgid "%s deleted from your access list."
 msgstr "%s usuniêto z Twojej listy dostêpu."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s usuniêto z Twojej listy dostêpu."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s usuniêto z Twojej listy dostêpu."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s wy³±czono na kanale %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s posiada za du¿o zarejestrowanych kana³ów."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s umo¿liwia wysy³anie krótkich wiadomo¶ci\n"
+"do innych u¿ytkowników (niezale¿nie od tego czy\n"
+"s± oni w danej chwili na IRCu) lub do kana³ów(*).\n"
+"Aby móc u¿ywaæ tego serwisu nadawca i odbiorca\n"
+"(kana³ lub nick) musz± byæ zarejestrowani.\n"
+"Poni¿sze komendy pozwalaj± na wysy³anie i\n"
+"odbieranie wiadomo¶ci, aby ich u¿yæ wpisz:\n"
+"/msg %s komenda\n"
+"Aby uzyskaæ szczegó³owy opis polecenia wpisz:\n"
+"/msg %s HELP komenda"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s ju¿ jest obejmowane przez %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s dodano do Twojej listy dostêpu."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s nie jest prawid³owym rodzajem bana."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s nie jest prawid³ow± nazw± bota lub kana³u."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s nie jest prawid³owym adresem e-mail."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s nie jest aktualnie na kanale %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s nie znaleziono na li¶cie ignorowanych."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s posiada wyj±tek na %s i nie mo¿e byæ zbanowany póki nie zostanie usuniêty."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -329,12 +329,12 @@ msgstr "%s przeniesiono do listy AOP kana³u %s."
 msgid "%s not found on %s %s list."
 msgstr "%s nie znaleziono na li¶cie AOP kana³u %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s nie znaleziono na li¶cie dostêpu kana³u %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s nie znaleziono na li¶cie AKICK kana³u %s."
@@ -344,32 +344,32 @@ msgstr "%s nie znaleziono na li¶cie AKICK kana³u %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s nie znaleziono na li¶cie zakazanych s³ów kana³u %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s nie znaleziono na li¶cie sesji."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s nie znaleziono na li¶cie wyj±tków limitów sesji."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s nie znaleziono na li¶cie AKILL."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s nie znaleziono na li¶cie SNLINE."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s nie znaleziono na li¶cie SQLINE."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s nie znaleziono na li¶cie SZLINE."
@@ -379,12 +379,17 @@ msgstr "%s nie znaleziono na li¶cie SZLINE."
 msgid "%s not found on your access list."
 msgstr "%s nie znaleziono na Twojej li¶cie dostêpu."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s nie znaleziono na Twojej li¶cie dostêpu."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s usuniêto z Twojej listy dostêpu."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -408,17 +413,12 @@ msgstr "Nick %s bêdzie ignorowany przez %s."
 msgid "%s will now permanently be ignored."
 msgstr "Nick %s bêdzie stale ignorowany."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Uwaga: Wszystkie komendy odbierane przez %s s± logowane!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Uwaga: Serwisy s± w trybie tylko do odczytu - zmiany nie bêd± zapisywane!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -426,11 +426,12 @@ msgstr ""
 "Uwaga: maska AKILL nie mo¿e zawieraæ nicków.\n"
 "Upewnij siê, ¿e nie dodajesz czê¶ci nicka."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Uwaga: mo¿esz dodawaæ jedynie maski IP do listy SZLINE."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -486,22 +487,22 @@ msgstr "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ zosta³a przeczytana."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER has³o email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER has³o email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP nazwa has³o"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -518,7 +519,7 @@ msgstr ""
 "z³o¶liwych akcji. Nadu¿ycia bêd± skutkowa³y co najmniej\n"
 "utrat± zarejestrowanego nicka."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -531,7 +532,8 @@ msgstr ""
 "Mog± przegl±daæ listê dostêpu ka¿dego kana³u,\n"
 "listê AKICK, ustawienia poziomów dostêpu itd."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -544,986 +546,343 @@ msgstr ""
 "oraz przegl±daæ listê dostêpu do ka¿dego nicka\n"
 "(/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "             Inne opcje: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "         vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "         vhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "       Przydzielony bot: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "       Przydzielony bot: (brak)"
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "         Opcje: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "       Kopanie za capsa: %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "       Kopanie za capsa: %s (%d kop(y) do bana; minimum %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "       Kopanie za capsa: %s (minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "     W³a¶ciciel: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Typ bana: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr " Kopanie za pogrubienia: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr " Kopanie za pogrubienia: %s (%d kop(y) do bana)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "       Kopanie za flood: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "       Kopanie za flood: %s (%d kop(y) do bana; %d linii w %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "       Kopanie za flood: %s (%d linii w %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "\tMaska: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "      Kopanie za kolory: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "      Kopanie za kolory: %s (%d kop(y) do bana)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "         Wygasa: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "       Typ bana: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "        U¿ywano: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "Blokowane tryby: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr " Kopanie za powtarzanie: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr " Kopanie za powtarzanie: %s (%d kop(y) do bana; %d czasu)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr " Kopanie za powtarzanie: %s (%d czasu)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "       Zastêpca: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "     Zawieszony: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "       Kopanie za capsa: %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr " Kopanie za pogrubienia: %s (%d kop(y) do bana)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "        Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "        Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "  Ostatni temat: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr " Zarejestrowano: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (wy³±czony)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (tylko w³a¶ciciel)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS      Zarz±dza list± dostêpu"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS      Zarz±dza list± dostêpu"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr "    ACT            Wyra¿a przez bota akcjê (komenda /me)"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK       Zarz±dza list± AKICK"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK       Zarz±dza list± AKICK"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Zarz±dza list± AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST       Listuje kana³y na których masz uprawnienia"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP         Zarz±dza list± AOP (operatorów)"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "    ASSIGN         Przydziela bota na kana³"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     W³±cza lub wy³±cza automatyczne opowanie"
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     W³±cza lub wy³±cza automatyczne opowanie"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "    BADWORDS       Zarz±dza list± zakazanych s³ów"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN         Banuje wskazan± osobê na kanale"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       Ustawia sposób banowania przez serwisy"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "    BOT            Zarz±dza sieciow± list± botów"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "    BOTLIST        Listuje dostêpne boty"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL      Wycofuje ostatni± wys³an± wiadomo¶æ"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL wszystkich u¿ytkowników na kanale"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Listuje wszystkie kana³y"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK       Sprawdza czy ostatnia wiadomo¶æ zosta³a przeczytana"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR       Usuwa wskazane obiekty z kana³u"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN       Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM     Potwierdza rejestracjê nicka"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "    Utworzony: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Modyfikuje poziom systemu DefCon"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP    Odbiera wskazanej osobie uprawnienia pó³-operatora"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Usuwa vhost wskazanego u¿ytkownika"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL         Kasuje jedn± lub wiêcej wiadomo¶ci"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Usuwa vhosty wszystkich nicków w grupie"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP        Odbiera wskazanej osobie uprawnienia operatora"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER     Usuwa twój status w³a¶ciciela kana³u"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT   Wy³±cza ochronê wskazanej osoby"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Ustawia opis kana³u"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE     Odbiera wskazanej osobie prawo g³osu"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP        Usuwa kana³"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP        Usuwa nicka"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "           Opis: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Zarz±dza list± wyj±tków dla limitów sesji"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID      Blokuje podany kana³"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID      Blokuje podany nick"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Ustawia nick w³a¶ciciela kana³u"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL    Wy¶wietla u¿ytkowników zarejestrowanych z\n"
-"                podanym adresem e-mail"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY      Podaje klucz do wskazanego kana³u"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr "    GETPASS     Podaje has³o do wskazanego nicka"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST       Od³±cza wskazany nick od serwera"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST       Wy¶wietla wszystkie nicki w Twojej grupie"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Wysy³a wiadomo¶æ do wszystkich u¿ytkowników"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Przypisuje komunikat powitalny do nicka"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Przypisuje komunikat powitalny do nicka"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Synchronizuje vhosty wszystkich nicków w grupie"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP       Do³±cza nick do wskazanej grupy"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "     Powitanie: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP      Nadaje wskazanej osobie uprawnienia pó³-operatora"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Ukrywa poszczególne informacje o nicku"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP         Zarz±dza list± HOP (pó³-operatorów)"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY    Identyfikuje w³a¶ciciela nicka"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"    INFO           Pokazuje informacje i ustawienia BotServa\n"
-"                   dotycz±ce bota lub kana³u"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO        Pokazuje informacje o zarejestrowanym nicku"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO        Pokazuje informacje o zarejestrowanym kanale"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO        Wy¶wietla informacje o wiadomo¶ciach"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE      Zaprasza osobê wydaj±c± polecenie na kana³"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        Blokuje pod³±czanie podanego serwera"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     Zapamiêtuje temat kiedy kana³ jest pusty"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "    KICK           Konfiguruje opcje kopania"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Wyrzuca u¿ytkownika z kana³u"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK        Wyrzuca wskazany nick z kana³u"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       W³±cza lub wy³±cza ochronê nicka"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
-"               wysy³a³y komunikaty"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS      Zarz±dza poziomami dostêpu"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Listuje vhosty"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr "    LIST        Listuje zarejestrowane nicki pasuj±ce do wzorca"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr "    LIST        Listuje zarejestrowane kana³y pasuj±ce do wzorca"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST        Wy¶wietla wszystkie wiadomo¶ci"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr "    LOGONNEWS   Zarz±dza wiadomo¶ciami powitalnymi"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT      Odwraca dzia³anie komendy IDENTIFY"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Zmienia flagi kana³u"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Usuwa wszystkie flagi z kana³u"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Wy¶wietla informacja o podanym module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Listuje za³adowane modu³y"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     £aduje modu³"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     £aduje modu³"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Wy³adowuje modu³"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Zmienia sposób komunikacji serwisów"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Zapobiega wyga¶niêciu nicka"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr "    NOOP        Tymczasowo usuwa wszystkie O:linie na serwerze"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deaktywuje przypisanego vhosta"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Daje flagi operatora wybranemu u¿ytkownikowi"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Aktywuje przypisanego vhosta"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP          Nadaje wskazanej osobie uprawnienia operatora"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS    Zarz±dza wiadomo¶ciami dla operatorów"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Wysy³a powiadomienie kiedy zostaj± u¿yte\n"
-"                  komendy OP/DEOP"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER       Nadaje Tobie status w³a¶ciciela kana³u"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "\tOpcje: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Ustawia has³o do nicka"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Ustawia has³o do nicka"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Reguluje u¿ycie krytycznych komend"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr ""
-"    PRIVATE       Zapobiega wy¶wietlaniu kana³u po wydaniu\n"
-"                  polecenia LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
-"               polecenia: /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT     Chroni wskazan± osobê"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Wy³±cza serwisy bez zapisywania baz"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr "    RANDOMNEWS  Zarz±dza losowymi wiadomo¶ciami"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ        Wy¶wietla jedn± lub wiêcej wiadomo¶ci"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER     Od³±cza u¿ytkownika, który u¿ywa Twojego nicka"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER    Rejestruje nicka"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER    Rejestruje nicka"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE     Zwalnia nick po u¿yciu komendy RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      £aduje na nowo plik konfiguracyjny"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND      Wysy³a ponownie kod autoryzuj±cy"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Zapisuje bazy i restartuje serwisy"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Ogranicza dostêp do kana³u"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND       Wysy³a wiadomo¶æ z ¿±daniem potwierdzenia odbioru"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr " Kopanie za odw kolorów: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr " Kopanie za odw kolorów: %s (%d kop(y) do bana)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET       Ustawia opcje wskazanemu nickowi"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr "    SAY            Wypowiada przez bota tekst na kanale"
-
-#: modules/core/cs_set_secure.cpp:64
-#, fuzzy, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        W³±cza lub wy³±cza bezpieczeñstwo kana³u"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     W³±cza lub wy³±cza bezpieczeñstwo nicka"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER ¦ci¶le kontroluje status w³a¶ciciela"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     ¦ci¶le kontroluje status operatorów"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND        Wysy³a wiadomo¶æ do u¿ytkownika/kana³u"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr ""
-"    SENDALL     Wysy³a wiadomo¶æ do wszystkich\n"
-"                zarejestrowanych u¿ytkowników"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS    Pomaga odzyskaæ utracone has³o"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Wy¶wietla listê sesji"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "    SET            Konfiguruje bota"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Zmienia vhost wskazanemu u¿ytkownikowi"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Ustawia ró¿ne globalne opcje serwisów"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET         Modyfikuje ustawienia kana³u"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET         Modyfikuje ustawienia nicka"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET         Ustawia opcje zwi±zane z wiadomo¶ciami"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Zmienia vhosty wszystkich nicków w grupie"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Wy³±cza serwisy z zapisaniem baz"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Podpisuje kicki kiedy u¿yto komendy KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Zarz±dza list± SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP         Zarz±dza list± SOP (super-operatorów)"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Zarz±dza list± SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Wy¶wietla ekipê serwisów oraz jej status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr ""
-"    STAFF       Wysy³a wiadomo¶æ do wszystkich\n"
-"                operatorów/administratorów"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Pokazuje informacje o serwisach i sieci"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS      Zwraca aktualny poziom dostêpu do\n"
-"                kana³u wskazanego u¿ytkownika"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS      Podaje status w³a¶ciciela podanego nicka"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Ustawia nick spadkobiercy kana³u"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND     Blokuje podany kana³ z zachowaniem\n"
-"                wszelkich jego danych i ustawieñ"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr ""
-"    SUSPEND     Blokuje podany nick z zachowaniem\n"
-"                wszelkich jego danych i ustawieñ"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Wymusza zmianê nicka danego u¿ytkownika"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Zarz±dza list± SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC       Zmienia temat podanego kana³u"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Ogranicza mo¿liwo¶æ zmiany tematu"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Modyfikuje flagi wskazanego u¿ytkownika"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "    UNASSIGN       Usuwa bota z kana³u"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN       Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND   Uwalnia zawieszony kana³"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND   Uwalnia zawieszonego nicka"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr "    UPDATE      Wymusza natychmiastowy zapis baz na dysku"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE      Aktualizuje twój obecny status np.\n"
-"                sprawdza nowe wiadomo¶ci"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Listuje wszystkich u¿ytkowników"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "    Obecny na: %d kana³ach"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE       Nadaje wskazanej osobie prawo g³osu"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP         Zarz±dza list± VOP (osób z prawem g³osu)"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr ""
-"    XOP           W³±cza system uprawnieñ xOP\n"
-"                  (u¿ycie komend SOP, AOP, HOP, VOP)"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (wygasa za %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "       Kopanie za s³owa: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "       Kopanie za s³owa: %s (%d kop(y) do bana)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "  Adres e-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr " Jest online z: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "      Widziano: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Ustawiony przez: %s"
@@ -1533,20 +892,6 @@ msgstr "Ustawiony przez: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1557,26 +902,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1586,98 +922,81 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "\tNazwa: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Zarejestrowano: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Kopanie za podkre¶lenia: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Kopanie za podkre¶lenia: %s (%d kop(y) do bana)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Nr   Nadawca            Data/Czas"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr "\"/msg %s\" nie jest ju¿ obs³ugiwane. U¿yj \"/msg %s@%s\" lub \"/%s\"."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        Blokuje pod³±czanie podanego serwera"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (przez %s na %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (przez %s na %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1696,17 +1015,12 @@ msgstr ""
 "%5d (%s przez %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Komendy %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s nie otrzymuje powiadomieñ o nowych wiadomo¶ciach."
@@ -1716,34 +1030,34 @@ msgstr "%s nie otrzymuje powiadomieñ o nowych wiadomo¶ciach."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (przez %s na %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "Za³adowanych modu³ów: %d."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d boty(ów) dostêpnych."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicków w grupie."
@@ -1754,14 +1068,14 @@ msgstr "%d nicków w grupie."
 msgid "%s %s list is empty."
 msgstr "Lista AOP kana³u %s jest pusta."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista dostêpu kana³u %s jest pusta."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Lista AKICK kana³u %s jest pusta."
@@ -1771,7 +1085,7 @@ msgstr "Lista AKICK kana³u %s jest pusta."
 msgid "%s bad words list is empty."
 msgstr "Lista zakazanych s³ów dla kana³u %s jest pusta."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
@@ -1782,47 +1096,47 @@ msgstr ""
 msgid "%s cannot receive memos."
 msgstr "%s nie mo¿e odbieraæ wiadomo¶ci."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Komendy %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "%s jest za ogólna; u¿yj bardziej szczegó³owej maski."
+msgid "%s commands:"
+msgstr "Komendy %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ma aktualnie %d wiadomo¶ci, z czego %d jest nieprzeczytanych."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ma aktualnie %d wiadomo¶ci, w tym jedn± nieprzeczytan±."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ma aktualnie %d wiadomo¶ci."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ma aktualnie %d nieprzeczytanych wiadomo¶ci."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ma aktualnie jedn± wiadomo¶æ, która jest nieprzeczytana."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s aktualnie ma jedn± wiadomo¶æ."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s aktualnie nie ma wiadomo¶ci."
@@ -1832,47 +1146,27 @@ msgstr "%s aktualnie nie ma wiadomo¶ci."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s ma zbyt du¿o wiadomo¶ci i nie mo¿e otrzymywaæ nowych."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s nie ma limitu wiadomo¶ci."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s nie ma wiadomo¶ci."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s nie ma nowych wiadomo¶ci."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s to %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s jest operatorem serwisów typu %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s jest obecnie offline."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s jest teraz online."
@@ -1894,24 +1188,24 @@ msgstr "%s jest w³±czone"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s nie jest ju¿ d³u¿ej super-administratorem"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s nie otrzymuje powiadomieñ o nowych wiadomo¶ciach."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s otrzymuje powiadomienia o nowych wiadomo¶ciach\n"
 "podczas logowania i w momencie ich nadej¶cia."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s otrzymuje powiadomienia o nowych wiadomo¶ciach podczas logowania."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr ""
@@ -1931,6 +1225,11 @@ msgstr ""
 "Lista AOP kana³u %s:\n"
 "  Nr   Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1972,63 +1271,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) dodano do listy botów."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s ma limit wiadomo¶ci %d i nie mo¿e byæ zmieniony."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s ma limit wiadomo¶ci %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILLuje wszystkich nowych klientów"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Wymusza ustawienie flag (%s) na wszystkich kana³ach"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignoruje zwyk³ych u¿ytkowników (informuje ich o tym)"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killuje wszystkich nowych klientów"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Flagi kana³ów nie bêd± wymuszane (MLOCK)"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Wy³±cza rejestrowanie kana³ów"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Nowe wiadomo¶ci nie bêd± wysy³ane"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Wy³±cza rejestrowanie nicków"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Cicho ignoruje zwyk³ych u¿ytkowników"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* U¿ywa zredukowanego limitu sesji: %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<nieznane>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Wiadomo¶æ zosta³a wys³ana do wszystkich zarejestrowanych u¿ytkowników."
 
@@ -2039,38 +1341,29 @@ msgid ""
 "read his/her memo."
 msgstr "Powiadomienie o przeczytaniu wiadomo¶ci zosta³o wys³ane do %s."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Kod zosta³ wys³any na adres %s.\n"
 "Napisz /msg %s CONFIRM <kod>, aby dokoñczyæ procedurê rejestracji."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "Ident vhosta musi mieæ format prawid³owego identa."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Vhost musi mieæ format prawid³owej maski hosta."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS kana³ {ADD|DEL|LIST|VIEW|CLEAR} [nick [poziom] | pozycja]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [maska]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT kana³ tekst"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [maska]"
@@ -2084,19 +1377,24 @@ msgstr ""
 "AKICK kana³ {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-lub-maska] [powód]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 "Egzekucja listy AKICK kana³u %s zakoñczona.\n"
 "Dotyczy³a %d u¿ytkowników."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL wszystkich u¿ytkowników na kanale"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "Lista AKILL jest pusta."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2105,47 +1403,38 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kana³ nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Odmowa dostêpu."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr ""
 "Poziom dostêpu dla %s na kanale %s\n"
 "zmieniono na %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr ""
 "Poziom dostêpu dla %s na kanale %s jest\n"
 "nadany od %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Poziom dostêpu musi byæ pomiêdzy %d a %d w³±cznie."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Poziom dostêpu nie mo¿e byæ zerem."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Ustawienia poziomów dostêpu kana³u %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Poziomy dostêpu kana³u %s zosta³y zresetowane do domy¶lnych."
@@ -2160,20 +1449,11 @@ msgstr "Lista dostêpu dla %s jest pusta."
 msgid "Access list for %s:"
 msgstr "Lista dostêpu dla %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Lista dostêpu kana³u %s:\n"
-"  Nr   Poz  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista dostêpu:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2182,6 +1462,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        W³±cza lub wy³±cza bezpieczeñstwo kana³u"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Aktywuje przypisanego vhosta"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2202,7 +1492,7 @@ msgstr "Dodano now± wiadomo¶æ dla operatorów (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Dodano now± losow± wiadomo¶æ (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2215,22 +1505,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Wszystkie O:linie %s zosta³y usuniête."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Wszystkie O:linie %s zosta³y zresetowane."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
@@ -2239,12 +1529,12 @@ msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 msgid "All logon news items deleted."
 msgstr "Wszystkie wiadomo¶ci powitalne zosta³ skasowane."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Wszystkie wiadomo¶ci kana³u %s zosta³y usuniête."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Wszystkie Twoje wiadomo¶ci zosta³y usuniête."
 
@@ -2256,22 +1546,22 @@ msgstr "Wszystkie wiadomo¶ci dla operatorów zosta³y skasowane."
 msgid "All random news items deleted."
 msgstr "Wszystkie losowe wiadomo¶ci zosta³y skasowane."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Wszyscy u¿ytkownicy zostali usuniêci z kana³u %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Wszystkie vhosty w grupie %s zosta³y zmienione na %s@%s"
@@ -2393,12 +1683,34 @@ msgstr "Pozwala u¿ywaæ publicznych komend FANTASY"
 msgid "Allowed to view the access list"
 msgstr "Pozwala przegl±daæ listê dostêpu"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"    INFO           Pokazuje informacje i ustawienia BotServa\n"
+"                   dotycz±ce bota lub kana³u"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "    ASSIGN         Przydziela bota na kana³"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Przypisuje komunikat powitalny do nicka"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "AUTOOP"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista AKICK dla kana³u %s:"
@@ -2423,17 +1735,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Automatyczne nadawanie prawa g³osu (+v)"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS kana³ {ADD|DEL|LIST|CLEAR} [s³owo | pozycja] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #kana³ nick [powód]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2452,26 +1764,26 @@ msgstr ""
 "Lista zakazanych s³ów dla %s:\n"
 "  Nr    S³owo                          Typ"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Lista zakazanych s³ów zosta³a wyczyszczona."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Rodzajem bana dla kana³u %s jest teraz #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN         Banuje wskazan± osobê na kanale"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s ju¿ istnieje."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Bot %s nie istnieje."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s zosta³ przypisany do %s."
@@ -2486,27 +1798,27 @@ msgstr "Bot %s zosta³ zmieniony na %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Bot %s zosta³ usuniêty."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s jest ju¿ postawiony na %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot bêdzie teraz kopa³ operatorów na kanale %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot bêdzie kopa³ voiców na kanale %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot nie bêdzie kopa³ operatorów na kanale %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot nie bêdzie kopa³ voiców na kanale %s."
@@ -2536,16 +1848,11 @@ msgstr "Ident bota mo¿e zawieraæ tylko prawid³owe znaki."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Nick bota mo¿e zawieraæ tylko prawid³owe znaki."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Nie ma bota na kanale %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Lista botów:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2554,7 +1861,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2565,7 +1872,7 @@ msgstr ""
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana.\n"
 "U¿yj komendy BADWORDS, aby modyfikowaæ listê."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2573,7 +1880,7 @@ msgstr ""
 "Bot bêdzie kopa³ za zakazane s³owa.\n"
 "U¿yj komendy BADWORDS, aby modyfikowaæ listê s³ów."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2582,11 +1889,11 @@ msgstr ""
 "Bot bêdzie kopa³ za pogrubienia,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Bot bêdzie kopa³ za pogrubienia."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2597,7 +1904,7 @@ msgstr ""
 "musz± stanowiæ %d znaków %d%% ca³ej wiadomo¶ci).\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2606,7 +1913,7 @@ msgstr ""
 "Bot bêdzie kopa³ za CAPSa (du¿e litery\n"
 "musz± stanowiæ %d znaków %d%% ca³ej wiadomo¶ci)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2615,11 +1922,11 @@ msgstr ""
 "Bot bêdzie kopa³ za kolory,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Bot bêdzie kopa³ za kolory."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2628,14 +1935,14 @@ msgstr ""
 "Bot bêdzie kopa³ za flood (%d linii w %d sekund),\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 "Bot bêdzie kopa³ za flood\n"
 "(%d linii w %d sekund)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2644,11 +1951,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2659,7 +1966,7 @@ msgstr ""
 "(u¿ytkowników, którzy napisz± %d razy to samo),\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2668,7 +1975,7 @@ msgstr ""
 "Bot bêdzie kopa³ za powtórzenia\n"
 "(u¿ytkowników, którzy napisz± %d razy to samo)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2677,11 +1984,11 @@ msgstr ""
 "Bot bêdzie kopa³ za odwracanie kolorów,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Bot bêdzie kopa³ za odwracanie kolorów."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2690,16 +1997,16 @@ msgstr ""
 "Bot bêdzie kopa³ za podkre¶lenia,\n"
 "po %d kopach dla tego samego u¿ytkownika za³o¿y bana."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Bot bêdzie kopa³ za podkre¶lenia."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Bot bêdzie kopa³ za kolory."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2708,184 +2015,209 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot nie bêdzie kopa³ za zakazane s³owa."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot nie bêdzie kopa³ za pogrubienia."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Bot nie bêdzie kopa³ za CAPSa."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Bot nie bêdzie kopa³ za kolory."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Bot nie bêdzie kopa³ za flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot nie bêdzie kopa³ za powtórzenia."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot nie bêdzie kopa³ za odwracanie kolorów."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot nie bêdzie kopa³ za podkre¶lenia."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Bot nie bêdzie kopa³ za CAPSa."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d rekordów, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Boty zarezerwowane dla IRC operatorów:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Odebrano      : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Wys³ano       : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kana³}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [tekst|numer]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+czas-trwania] {#kana³} [powód]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kana³ [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR kana³ co"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL      Wycofuje ostatni± wys³an± wiadomo¶æ"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP        Usuwa kana³"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP        Usuwa nicka"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nie mogê wys³aæ teraz maila. Spróbuj za chwilê."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Lista botów:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Lista dostêpu dla %s jest pusta."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Lista dostêpu dla %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d rekordów, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Zmieniono flagi u¿ytkownika dla %s."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s zmienia Twoje flagi u¿ytkownika."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Kana³ %s nie istnieje."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Zmienia sposób komunikacji serwisów"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Zmieniono flagi u¿ytkownika dla %s."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Kana³ %s zosta³ odrejestrowany."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Kana³ %s zosta³ zablokowany przez %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Kana³ %s jest ju¿ zarejestrowany!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Kana³ %s zosta³ zablokowany."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Kana³ %s zosta³ uwolniony."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Kana³ %s zosta³ zawieszony."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Kana³ %s nie jest zarejestrowany."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Kana³u %s nie mo¿na rejestrowaæ ani u¿ywaæ."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Kana³u %s nie mo¿na rejestrowaæ."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr ""
 "Kana³ %s zosta³ teraz zarejestrowany.\n"
 "Jako %s jeste¶ od teraz jego w³a¶cicielem."
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kana³         : %6d rekordów, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Kana³ %s od teraz podlega prawu wygasania."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Kana³ %s nie wyga¶nie."
@@ -2895,31 +2227,26 @@ msgstr "Kana³ %s nie wyga¶nie."
 msgid "Channel %s %s list has been cleared."
 msgstr "Lista AOP kana³u %s zosta³a wyczyszczona."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista dostêpu kana³u %s zosta³a wyczyszczona."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Lista AKICK kana³u %s zosta³a wyczyszczona."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Kana³ %s zosta³ uwolniony."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "%s nie jest prawid³owym kana³em."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr "Kana³owe SQLINE nie jest obs³ugiwane przez Twoje ircd."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2927,7 +2254,7 @@ msgstr ""
 "Lista kana³ów:\n"
 "Nazwa                Tryby u¿yt.   Temat"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2936,7 +2263,7 @@ msgstr ""
 "Kana³y, na których %s jest na li¶cie dostêpu:\n"
 "  Nr   Kana³              Poziom    Opis"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2944,16 +2271,47 @@ msgstr ""
 "Kana³y, na których jeste¶ na li¶cie dostêpu:\n"
 "  Nr   Kana³              Poziom    Opis"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK       Sprawdza czy ostatnia wiadomo¶æ zosta³a przeczytana"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "    SET            Konfiguruje bota"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "    KICK           Konfiguruje opcje kopania"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM     Potwierdza rejestracjê nicka"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Usuwa wszystkie flagi z kana³u"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN       Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Nie mogê uwolniæ kana³u %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Aktualna lista AKILL:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2961,15 +2319,15 @@ msgstr ""
 "Aktualna lista AKILL:\n"
 "  Nr    Maska                             Powód"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Aktualna lista modu³ów:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Aktualna lista SNLINE:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2977,11 +2335,11 @@ msgstr ""
 "Aktualna lista SNLINE:\n"
 "  Nr    Maska                             Powód"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Aktualna lista SQLINE:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2989,11 +2347,11 @@ msgstr ""
 "Aktualna lista SQLINE:\n"
 "  Nr    Maska                             Powód"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Aktualna lista SZLINE:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3002,7 +2360,7 @@ msgstr ""
 "  Nr    Maska                             Powód"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Aktualna lista wyj±tków limitów sesji:"
 
@@ -3026,56 +2384,61 @@ msgstr "Aktualna ilo¶æ wpisów SQLINE: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Aktualna ilo¶æ wpisów SZLINE: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "U¿ytkowników  : %d (%d operatorów)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #kana³ [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kana³] {numer | list | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #kana³ [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #kana³ [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #kana³ [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #kana³ [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP kana³"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deaktywuje przypisanego vhosta"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3200,6 +2563,41 @@ msgstr "Domy¶lny czas wygasania SZLINE: 1 minuta"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Domy¶lny czas wygasania SZLINE: nie wygasa"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr "    LOGONNEWS   Zarz±dza wiadomo¶ciami powitalnymi"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr "    LOGONNEWS   Zarz±dza wiadomo¶ciami powitalnymi"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS    Zarz±dza wiadomo¶ciami dla operatorów"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP    Odbiera wskazanej osobie uprawnienia pó³-operatora"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL         Kasuje jedn± lub wiêcej wiadomo¶ci"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Usuwa vhosty wszystkich nicków w grupie"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Usuwa vhost wskazanego u¿ytkownika"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3210,7 +2608,7 @@ msgstr "Usuniêto %d wpisów(y) z listy AOP kana³u %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "Usuniêto %d wpisów(y) z listy dostêpu kana³u %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Usuniêto %d wpisów z listy AKICK kana³u %s."
@@ -3252,7 +2650,7 @@ msgstr "Usuniêto %d wpisy(ów) z listy SZLINE."
 msgid "Deleted 1 entry from %s access list."
 msgstr "Usuniêto 1 wpis z listy dostêpu kana³u %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Usuniêto 1 wpis z listy AKICK kana³u %s."
@@ -3287,32 +2685,74 @@ msgstr "Usuniêto 1 wpis z listy SZLINE."
 msgid "Deleted one entry from %s %s list."
 msgstr "Usuniêto 1 wpis z listy AOP kana³u %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP        Odbiera wskazanej osobie uprawnienia operatora"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT   Wy³±cza ochronê wskazanej osoby"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Opis kana³u %s zosta³ zmieniony na %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "wy³±czone"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE     Odbiera wskazanej osobie prawo g³osu"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST       Od³±cza wskazany nick od serwera"
+
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Wy¶wietla ekipê serwisów oraz jej status"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Wy¶wietlono wszystkie wpisy (Liczba: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Wy¶wietlono wpisy od %d do %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Wy¶wietlono pasuj±ce wpisy %s (Liczba: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO        Pokazuje informacje o zarejestrowanym nicku"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO        Wy¶wietla informacje o wiadomo¶ciach"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Listuje vhosty"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO        Wy¶wietla informacje o wiadomo¶ciach"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3341,167 +2781,208 @@ msgstr "Nie u¿ywaj s³owa \"%s\" na tym kanale!"
 msgid "Don't use underlines on this channel!"
 msgstr "Nie u¿ywaj podkre¶leñ na tym kanale!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Adres e-mail osoby %s zosta³ zmieniony na %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Adres e-mail osoby %s zosta³ usuniêty."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Adres e-mail dla %s nie jest prawid³owy."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametry]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Adresy e-mail %s pasuj±ce do %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "w³±czone"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Koniec listy %s."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Koniec listy dostêpu."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Koniec listy kana³ów."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Koniec listy - %d/%d kana³ów pokazano."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Koniec listy - %d/%d wpisów wy¶wietlono."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Koniec listy u¿ytkowników."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Polski"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
-msgstr "B³±d! Ident jest za d³ugi, u¿yj identa krótszego ni¿ %d znaków."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
+msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      £aduje na nowo plik konfiguracyjny"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
-msgstr "B³±d! Vhost jest za d³ugi, u¿yj vhosta krótszego ni¿ %d znaków."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
+msgstr ""
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Wyj±tek dla %s (#%d) przeniesiono na pozycjê %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Wyj±tek dla %s zosta³ zaktualizowany do %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "        Wygasa: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Zmieniono czas wygasania %s."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID kana³ powód"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID kana³ [powód]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nick powód"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [powód]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "FANTASY"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, fuzzy, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr "Komendy fantasy na kanale %s zosta³y w³±czone."
+
+#: modules/core/bs_set.cpp:104
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr "Komendy fantasy na kanale %s zosta³y w³±czone."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "Nick %s nie bêdzie ignorowany."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Maska %s jest ju¿ w Twojej li¶cie dostêpu."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr "    UPDATE      Wymusza natychmiastowy zapis baz na dysku"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Wymusza zmianê nicka danego u¿ytkownika"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS    Pomaga odzyskaæ utracone has³o"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "W³a¶cicielem kana³u %s jest teraz %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host Bez symboli wieloznacznych!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY kana³"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Komenda GETPASS nie dzia³a, bo has³a s± szyfrowane."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [has³o]"
 
@@ -3509,11 +2990,26 @@ msgstr "GHOST nick [has³o]"
 msgid "GLOBAL message"
 msgstr "GLOBAL tre¶æ wiadomo¶ci"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Nick zosta³ usuniêty z sieci."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Daje flagi operatora wybranemu u¿ytkownikowi"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP          Nadaje wskazanej osobie uprawnienia operatora"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER       Nadaje Tobie status w³a¶ciciela kana³u"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "GREET"
 
@@ -3521,78 +3017,158 @@ msgstr "GREET"
 msgid "Greet message displayed"
 msgstr "Wy¶wietla wiadomo¶æ powitaln± (greet)"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Wiadomo¶æ powitalna osoby %s zosta³a zmieniona na %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Wiadomo¶æ powitalna osoby %s zosta³a usuniêta."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Witanie u¿ytkowników na kanale %s zosta³o w³±czone."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Witanie u¿ytkowników na kanale %s zosta³o w³±czone."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #kana³ [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP      Nadaje wskazanej osobie uprawnienia pó³-operatora"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Ukrywa poszczególne informacje o nicku"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr ""
+"    PRIVATE       Zapobiega wy¶wietlaniu kana³u po wydaniu\n"
+"                  polecenia LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d rekordów, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosty z przynajmniej %d sesjami:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY has³o"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [czas] [nick | maska]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO kana³"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {kana³ | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE kana³"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY    Identyfikuje w³a¶ciciela nicka"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Masz 20 sekund na zmianê nicka, potem zostanie zmieniony si³±."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Masz jedn± minutê na zmianê nicka, potem zostanie zmieniony si³±."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Lista ignorowanych zosta³a wyczyszczona."
@@ -3601,12 +3177,13 @@ msgstr "Lista ignorowanych zosta³a wyczyszczona."
 msgid "Ignore list is empty."
 msgstr "Lista ignorowanych jest pusta."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Lista botów:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3622,38 +3199,28 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %s HELP SET opcja"
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Podano nieprawid³owy zakres. Poprawny zapis to #od-do."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Wy¶wietla informacja o podanym module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informacje o bocie %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informacje o kanale %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Nieprawid³owy czas wygasania."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 "Nieprawid³owa maska. Tylko rzeczywiste maski s± prawid³owe jako wyj±tki."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Podano nieprawid³owy kod, sprawd¼ wiadomo¶æ e-mail i spróbowaæ ponownie."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3661,7 +3228,7 @@ msgid ""
 msgstr ""
 "Nieprawid³owy limit sesji. Musi byæ liczb± nieujemn± i mniejsz± ni¿ %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Nieprawid³owa warto¶æ progu. Musi byæ liczb± ca³kowit± wiêksz± ni¿ 1."
 
@@ -3669,12 +3236,17 @@ msgstr "Nieprawid³owa warto¶æ progu. Musi byæ liczb± ca³kowit± wiêksz± ni¿ 1."
 msgid "JUPE servername [reason]"
 msgstr "JUPE serwer [powód]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP       Do³±cza nick do wskazanej grupy"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #kana³ nick [powód]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kana³ opcja {ON|OFF} [ustawienia]"
@@ -3683,266 +3255,445 @@ msgstr "KICK kana³ opcja {ON|OFF} [ustawienia]"
 msgid "KICK channel user reason"
 msgstr "KICK kana³ nick powód"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Kluczem do kana³u %s jest %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Wyrzuca u¿ytkownika z kana³u"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK        Wyrzuca wskazany nick z kana³u"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER     Od³±cza u¿ytkownika, który u¿ywa Twojego nicka"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kana³ {SET | DIS[ABLE] | LIST | RESET} [element [poziom]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST wzorzec"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kana³] [lista | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP nazwa has³o"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]\n"
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Jêzyk zosta³ zmieniony na Polski."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ostatnia wiadomo¶æ do %s zosta³a odwo³ana."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "  Ostatni QUIT: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "  Ostatni host: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr ""
 "Wymagany poziom dla %s\n"
 "na kanale %s zmieniono teraz na %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Poziom musi byæ pomiêdzy %d a %d w³±cznie."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Modyfikowanie poziomów nie jest dostêpne w trybie XOP."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lista pasuj±cych wpisów %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr "    LIST        Listuje zarejestrowane nicki pasuj±ce do wzorca"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST       Listuje kana³y na których masz uprawnienia"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Listuje za³adowane modu³y"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista nicków grupy %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lista nicków w grupie:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST        Wy¶wietla wszystkie wiadomo¶ci"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Listuje wszystkie kana³y"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lista nicków w grupie:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr "    LIST        Listuje zarejestrowane kana³y pasuj±ce do wzorca"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Listuje wszystkich u¿ytkowników"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "    BOTLIST        Listuje dostêpne boty"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO        Pokazuje informacje o zarejestrowanym kanale"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     £aduje modu³"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Lokalne kana³y nie mog± byæ rejestrowane."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
+msgstr "Wiadomo¶æ powitalna #%d zosta³a skasowana."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Wiadomo¶æ powitalna #%d nie zosta³a znaleziona!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Wiadomo¶ci powitalne:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE kana³ flagi"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO nazwa-pliku"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD nazwa-pliku"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD nazwa-pliku"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD nazwa-pliku"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK       Zarz±dza list± AKICK"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "    BADWORDS       Zarz±dza list± zakazanych s³ów"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "    BOT            Zarz±dza sieciow± list± botów"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP         Zarz±dza list± HOP (pó³-operatorów)"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP         Zarz±dza list± VOP (osób z prawem g³osu)"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr "    ACT            Wyra¿a przez bota akcjê (komenda /me)"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr "    SAY            Wypowiada przez bota tekst na kanale"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK       Zarz±dza list± AKICK"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Zarz±dza list± AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Modyfikuje poziom systemu DefCon"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Zarz±dza list± SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Zarz±dza list± SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Zarz±dza list± SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC       Zmienia temat podanego kana³u"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Maska %s jest ju¿ w Twojej li¶cie dostêpu."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Maska musi mieæ format ident@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL    Wy¶wietla u¿ytkowników zarejestrowanych z\n"
+"                podanym adresem e-mail"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Rekord u¿ytk. : %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Wiadomo¶æ %d od %s (%s). Aby usun±æ, napisz: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Wiadomo¶æ %d od %s (%s). Aby usun±æ, napisz: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Wiadomo¶æ %d zosta³a usuniêta."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limit wiadomo¶ci dla %s jest wy³±czony."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limit wiadomo¶ci dla %s zmieniono na %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limit wiadomo¶ci dla %s ustawiono na 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Limit wiadomo¶ci jest za du¿y. Limituj do %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Wiadomo¶æ zosta³a wys³ana do %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ numer"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ %s numer"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ numer"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Wiadomo¶ci dla %s. Aby przeczytaæ, napisz: /msg %s READ %s numer"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "MSG"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "Blokowane tryby: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Zarz±dza list± ignorowanych przez serwisy"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP         Zarz±dza list± AOP (operatorów)"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP         Zarz±dza list± SOP (super-operatorów)"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS      Zarz±dza list± dostêpu"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS      Zarz±dza list± dostêpu"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Zarz±dza list± wyj±tków dla limitów sesji"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Modu³ %s zosta³ za³adowany."
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Modu³ %s zosta³ za³adowany."
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Modu³ %s zosta³ wy³adowany."
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Modu³: %s Wersja: %s Autor: %s Za³adowano: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Modu³: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} serwer"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Aliasy NS     : %6d rekordów, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupy NS      : %6d rekordów, %5d kB"
@@ -3955,13 +3706,15 @@ msgstr "Ochrona przed kopaniem za pomoc± komendy KICK"
 msgid "New memo"
 msgstr "Nowa wiadomo¶æ"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr ""
 "Nowe wiadomo¶ci dla %s. Aby przeczytaæ,\n"
 "napisz: /msg %s READ numer"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr ""
 "Nowe wiadomo¶ci dla %s. Aby przeczytaæ,\n"
@@ -3971,141 +3724,107 @@ msgstr ""
 msgid "News list is full!"
 msgstr "Lista wiadomo¶ci powitalnych jest pe³na!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Nick %s zosta³ zablokowany przez %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Nick %s zosta³ odrejestrowany."
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Nick %s jest ju¿ zarejestrowany!"
+
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s jest nieprawid³owy i nie mo¿e byæ u¿ywany."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s jest aktualnie w u¿yciu."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s zosta³ zablokowany."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s jest serwisem!"
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s nie jest zajêty przez serwisy."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Nick %s nie jest aktualnie u¿ywany."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Nick %s nie jest zarejestrowany."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Nick %s nie mo¿e byæ rejestrowany ani u¿ywany."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s nie znaleziono na li¶cie ignorowanych."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s zosta³ skrócony do %d znaków."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s od teraz podlega zasadom wygasania."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s nie wyga¶nie."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "%s nie posiada wiadomo¶ci od Ciebie."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Nick %s zosta³ wylogowany."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s jest obecnie zawieszony."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s zosta³ uwolniony."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s zosta³ zawieszony."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick nie zosta³ zarejestrowany. Proszê spróbowaæ pó¼niej."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nick %s potwierdzony."
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Nick %s zosta³ odrejestrowany."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Nick %s jest ju¿ zarejestrowany!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Nick %s nie mo¿e byæ rejestrowany."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "Nick %s zosta³ zarejestrowany z mask±: %s."
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nick %s zosta³ zarejestrowany."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Rejestracja nicka %s"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4116,26 +3835,36 @@ msgstr ""
 "usuwane po %d dniach od ostatniej identyfikacji.\n"
 "Wszelkie ustawienia oraz uprawnienia zostaj± usuniête."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now off on channel %s."
 msgstr "Opcja NOBOT zosta³a w³±czona na kanale %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/bs_set.cpp:136
+#, fuzzy, c-format
+msgid "No Bot mode is now on on channel %s."
+msgstr "Opcja NOBOT zosta³a w³±czona na kanale %s."
+
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nie ma u¿ytkowników z adresem e-mail %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "NOBOT"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "nie wygasa"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Brak dostêpnej pomocy dla %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Informacje o module %s nie s± dostêpne."
@@ -4150,13 +3879,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Nie znaleziono wpisów w li¶cie AOP kana³u %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nie znaleziono wpisów na li¶cie dostêpu kana³u %s."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nie znaleziono wpisów na li¶cie AKICK kana³u %s."
@@ -4167,39 +3896,43 @@ msgstr "Nie znaleziono wpisów na li¶cie AKICK kana³u %s."
 msgid "No matching entries on %s bad words list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie zakazanych s³ów kana³u %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Nie znaleziono wpisów na li¶cie wyj±tków limitów sesji."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie AKILL."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SNLINE."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SQLINE."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Nie znaleziono pasuj±cych wpisów na li¶cie SZLINE."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Brak wiadomo¶ci do odwo³ania."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Aktualnie nie ma za³adowanych modu³ów."
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nie ma wiadomo¶ci dla operatorów do skasowania!"
@@ -4208,16 +3941,12 @@ msgstr "Nie ma wiadomo¶ci dla operatorów do skasowania!"
 msgid "No random news items to delete!"
 msgstr "Nie ma losowych wiadomo¶ci do skasowania!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Bez powodu"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Nie podpisze kicka, gdy SIGNKICK LEVEL jest u¿ywany"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Brak"
 
@@ -4225,7 +3954,7 @@ msgstr "Brak"
 msgid "Not allowed to join channel"
 msgstr "Nie pozwala wej¶æ na kana³ w trybie RESTRICTED"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4237,28 +3966,28 @@ msgstr ""
 "na li¶cie dostêpu kana³u w tym czasie) zostanie\n"
 "automatycznie odrejestrowany."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Nr   Limit  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flagi"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OPNOTICE"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #kana³ [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #kana³ [nick]"
@@ -4267,13 +3996,18 @@ msgstr "OP #kana³ [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Nic siê nie zmieni³o."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr " Na Poziom Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "Opcja OPNOTICE dla kana³u %s zosta³a w³±czona."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "Opcja OPNOTICE dla kana³u %s zosta³a w³±czona."
 
 #: modules/core/os_news.cpp:55
@@ -4282,131 +4016,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Wiadomo¶æ dla operatorów #%d zosta³a skasowana."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Wiadomo¶æ dla operatorów #%d nie zosta³a znaleziona!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Wiadomo¶ci dla operatorów:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d rekordów, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "Flagi operatora %s zosta³y przyznane dla %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "DONTKICKOPS"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opcja %s nie jest dostêpna w tej sieci."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #kana³ [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Kod rejestracyjny dla %s to %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Has³o przyjête - jeste¶ zidentyfikowany(a)."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Aby u¿yæ tej komendy musisz siê zidentyfikowaæ.\n"
-"Napisz /msg %s IDENTIFY has³o, a pó¼niej ponów próbê."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Has³o dla %s zosta³o zmienione na %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Has³o dla %s zosta³o zmienione."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Nieprawid³owe has³o."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Has³o dla %s to %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Nieprawid³owe has³o."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Has³o do nicka %s zosta³o wys³ane."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "PEACE"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Opcja PEACE dla kana³u %s zosta³a w³±czona."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Opcja PEACE dla kana³u %s zosta³a w³±czona."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Skontaktuj siê z operatorem, aby uzyskaæ vhosta na ten nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Proszê spróbowaæ ponownie z trudniejszym has³em.\n"
-"Has³o powinno mieæ minimum 5 znaków oraz powinno\n"
-"zawieraæ cyfry i litery."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Proszê u¿yæ prawid³owej nazwy serwera."
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "U¿yj symboli # lub & podczas rejestracji"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Proszê odczekaæ %d sekund(y) i ponowiæ próbê."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy GROUP."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy REGISTER."
@@ -4421,63 +4119,122 @@ msgstr "Odczekaj %d sekund przed ponownym u¿yciem komendy RSEND."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Odczekaj %d sekund(y) przed ponownym u¿yciem komendy SEND."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID      Blokuje podany kana³"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND     Blokuje podany kana³ z zachowaniem\n"
+"                wszelkich jego danych i ustawieñ"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
+"               polecenia: /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Zapobiega wyga¶niêciu nicka"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID      Blokuje podany nick"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "PRIVATE"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "Opcja PRIVATE bota %s zosta³a w³±czona."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private mode of bot %s is now on."
+msgstr "Opcja PRIVATE bota %s zosta³a w³±czona."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "Opcja PRIVATE dla kana³u %s zosta³a w³±czona."
+
+#: modules/core/cs_set_private.cpp:33
+#, fuzzy, c-format
+msgid "Private option for %s is now on."
 msgstr "Opcja PRIVATE dla kana³u %s zosta³a w³±czona."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now off for %s."
 msgstr "Opcja prywatno¶ci dla %s zosta³a w³±czona."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
+msgstr "Opcja prywatno¶ci dla %s zosta³a w³±czona."
+
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "KILL"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Ochrona dla %s jest teraz w³±czona."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Ochrona dla %s ze zredukowanym opó¼nieniem jest teraz w³±czona."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Natychmiastowa ochrona dla %s jest teraz w³±czona"
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Ochrona dla %s jest teraz w³±czona."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT     Chroni wskazan± osobê"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Dodane komendy: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kana³] {lista | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [has³o]"
 
@@ -4485,15 +4242,15 @@ msgstr "RECOVER nick [has³o]"
 msgid "REGISTER channel description"
 msgstr "REGISTER kana³ opis"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [has³o]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | kana³} tre¶æ"
 
@@ -4503,291 +4260,364 @@ msgid "Random news item #%d deleted."
 msgstr "Losowa wiadomo¶æ #%d zosta³a skasowana."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Losowa wiadomo¶æ #%d nie zosta³a znaleziona!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Losowe wiadomo¶ci:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ        Wy¶wietla jedn± lub wiêcej wiadomo¶ci"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS      Zarz±dza poziomami dostêpu"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE     Zwalnia nick po u¿yciu komendy RECOVER"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER    Rejestruje nicka"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER    Rejestruje nicka"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Reguluje u¿ycie krytycznych komend"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND   Uwalnia zawieszony kana³"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     £aduje modu³"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      £aduje na nowo plik konfiguracyjny"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
 msgstr ""
-"Termin wa¿no¶ci kodu rejestracyjnego up³yn±³.\n"
-"Napisz: /msg %s REGISTER <has³o> <email>,\n"
-"aby znowu zacz±æ rejestracje."
+"    UNBAN       Remove all bans preventing a user from entering a channel"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER     Usuwa twój status w³a¶ciciela kana³u"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Ogranicza dostêp do kana³u"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "RESTRICTED"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr "Dostêp do kana³u %s jest teraz ograniczony."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_restricted.cpp:34
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now on."
+msgstr "Dostêp do kana³u %s jest teraz ograniczony."
+
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     Zapamiêtuje temat kiedy kana³ jest pusty"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr "    GETPASS     Podaje has³o do wskazanego nicka"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS      Zwraca aktualny poziom dostêpu do\n"
+"                kana³u wskazanego u¿ytkownika"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY      Podaje klucz do wskazanego kana³u"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS      Podaje status w³a¶ciciela podanego nicka"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT      Odwraca dzia³anie komendy IDENTIFY"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASAET nick PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nick opcja parametry"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nick AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nick KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nick KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nick LANGUAGE numer"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nick NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nick PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nick SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SASET nick HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY kana³ tekst"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | kana³} tre¶æ"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF tre¶æ wiadomo¶ci"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Komenda SENDPASS nie dzia³a, bo has³a s± szyfrowane."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limit"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <maska-hosta>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET (kana³ | bot) opcja ustawienie"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET nick-bota NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET nick-bota PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET kana³ opcja parametry"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kana³ DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kana³ DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET kana³ FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET kana³ GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kana³ KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET kana³ OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kana³ NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kana³ OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kana³ PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kana³ PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kana³ RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kana³ SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kana³ SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kana³ SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kana³ SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kana³ SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kana³ TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kana³ XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opcja parametry"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET opcja ustawienie"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numer"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kana³] limit"
 
@@ -4795,7 +4625,7 @@ msgstr "SET LIMIT [kana³] limit"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [nick | kana³] {limit | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
@@ -4803,24 +4633,24 @@ msgstr "SET MSG {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <maska-hosta>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "Lista SNLINE jest pusta."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4828,16 +4658,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "Lista SQLINE jest pusta."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4846,54 +4676,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Has³o przyjête - jeste¶ zidentyfikowany(a)."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Has³o przyjête - jeste¶ zidentyfikowany(a)."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF tre¶æ wiadomo¶ci"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS kana³ item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s nie jest online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND kana³ powód"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND kana³ powód"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick powód"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick nowy-nick"
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "Lista SZLINE jest pusta."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4902,64 +4742,124 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} "
 "[powód]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Zapisuje bazy i restartuje serwisy"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "SECURE"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "SECUREFOUNDER"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "SECUREOPS"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now off."
 msgstr "Status w³a¶ciciela kana³u %s bêdzie teraz chroniony."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_securefounder.cpp:40
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now on."
+msgstr "Status w³a¶ciciela kana³u %s bêdzie teraz chroniony."
+
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
+msgstr "Status operatora kana³u %s bêdzie teraz chroniony."
+
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now on."
 msgstr "Status operatora kana³u %s bêdzie teraz chroniony."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
+msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a w³±czona."
+
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now on."
 msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a w³±czona."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/ns_set_secure.cpp:41
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now off for %s."
 msgstr "Opcja bezpieczeñstwa dla %s zosta³a w³±czona."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
+msgstr "Opcja bezpieczeñstwa dla %s zosta³a w³±czona."
+
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "SECURE"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND        Wysy³a wiadomo¶æ do u¿ytkownika/kana³u"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr ""
+"    STAFF       Wysy³a wiadomo¶æ do wszystkich\n"
+"                operatorów/administratorów"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr ""
+"    SENDALL     Wysy³a wiadomo¶æ do wszystkich\n"
+"                zarejestrowanych u¿ytkowników"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Wysy³a wiadomo¶æ do wszystkich u¿ytkowników"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Wysy³a powiadomienie kiedy zostaj± u¿yte\n"
+"                  komendy OP/DEOP"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND       Wysy³a wiadomo¶æ z ¿±daniem potwierdzenia odbioru"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Serwerów      : %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "Serwisy s± w trybie defcon, spróbuj ponownie pó¼niej."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Serwisy s± teraz w systemie DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Serwisy s± teraz w trybie wygasania."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Serwisy nie s± ju¿ w trybie wygasania."
 
@@ -4971,7 +4871,7 @@ msgstr "Serwisy s± teraz w trybie tylko-do-odczytu."
 msgid "Services are now in read-write mode."
 msgstr "Serwisy s± teraz w trybie odczyt-zapis."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Serwisy s± teraz w trybie debugowania (poziom %d)."
@@ -4984,7 +4884,7 @@ msgstr "Serwisy s± teraz w trybie debugowania."
 msgid "Services are now in non-debug mode."
 msgstr "Serwisy nie s± ju¿ w trybie debugowania."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Serwisy zosta³y skonfigurowane tak, aby nie wysy³aæ poczty."
 
@@ -4994,7 +4894,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5003,153 +4903,192 @@ msgstr ""
 "Serwisy nie mog± zmieniaæ trybów. Czy U-linie serwerów s± dobrze "
 "skonfigurowane?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Serwisy dzia³aj± %d dni, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Serwisy dzia³aj± %d godzin i %d minut(y)."
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Serwisy dzia³aj± %d minut(y) i %d sekund(y)."
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Serwerów      : %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr ""
 "Serwisy nie bêd± ju¿ automatycznie nadawa³y uprawnieñ dla u¿ytkownika %s."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Serwisy bêd± automatycznie nadawa³y uprawnienia dla u¿ytkownika %s."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Serwisy bêd± teraz wysy³aæ do %s wiadomo¶ci."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Serwisy bêd± teraz wysy³aæ do %s powiadomienia."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Plik konfiguracyjny serwisów zosta³ prze³adowany."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Serwisy w³a¶nie zwolni³y twojego nicka."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limit sesji dla %s zmieniono na %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Limitowanie sesji jest wy³±czone."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sesji         : %6d rekordów, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sesje   Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET       Ustawia opcje wskazanemu nickowi"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET         Modyfikuje ustawienia kana³u"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       Ustawia sposób banowania przez serwisy"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET         Ustawia opcje zwi±zane z wiadomo¶ciami"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET         Modyfikuje ustawienia nicka"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Ustawia opis kana³u"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Ustawia nick reprezentuj±cy grupê nicków"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Ustawia nick w³a¶ciciela kana³u"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
+"               wysy³a³y komunikaty"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Ustawia has³o do nicka"
+
+#: modules/core/cs_set_successor.cpp:21
 #, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Ustawia nick spadkobiercy kana³u"
+
+#: modules/core/hs_setall.cpp:21
+#, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Zmienia vhosty wszystkich nicków w grupie"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Zmienia vhost wskazanemu u¿ytkownikowi"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Ustawia ró¿ne globalne opcje serwisów"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Ustawia has³o do nicka"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Nieznane ustawienie %s.\n"
 "Napisz /msg %s HELP LEVELS DESC, aby uzyskaæ listê dostêpnych mo¿liwo¶ci."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "Parametrem opcji DEBUG musi byæ ON, OFF albo liczba dodatnia."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Parametrem opcji NOEXPIRE musi byæ ON albo OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Parametrem opcji READONLY musi byæ ON albo OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 "Parametrem dla opcji SuperAdmin musi byæ ON lub OFF (musi byæ w³±czona w "
 "pliku konfiguracyjnym)"
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     W³±cza lub wy³±cza automatyczne opowanie"
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Pokazuje informacje o serwisach i sieci"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Podpisuje kicki kiedy u¿yto komendy KICK"
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5158,27 +5097,33 @@ msgstr ""
 "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone, ale\n"
 "bêdzie zale¿a³o od poziomu dostêpu jaki posiada u¿ytkownik."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Podpisywanie komendy KICK na kanale %s zosta³o w³±czone."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "SIGNKICK"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Komenda RSEND nie jest dostêpna w tej sieci."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Przydzielanie botów jest tymczasowo wy³±czone."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "B³±d, nie uda³o siê utworzyæ bota."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Modyfikacja botów jest tymczasowo wy³±czona."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Konfigurowanie bota jest tymczasowo wy³±czone."
 
@@ -5188,7 +5133,7 @@ msgstr "Konfigurowanie bota jest tymczasowo wy³±czone."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Modyfikacja listy AOP jest tymczasowo wy³±czona."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Modyfikacja listy dostêpu jest tymczasowo wy³±czona."
 
@@ -5196,63 +5141,42 @@ msgstr "Modyfikacja listy dostêpu jest tymczasowo wy³±czona."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Modyfikacja listy AKICK jest tymczasowo wy³±czona."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Modyfikacja listy zakazanych s³ów jest tymczasowo wy³±czona."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Usuwanie kana³ów jest tymczasowo wy³±czone."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Modyfikacja ustawieñ kana³u jest tymczasowo wy³±czona."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Rejestracja kana³ów jest tymczasowo wy³±czona."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Zmiana has³a dla %s nie powiod³a siê."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Identyfikacja nie powiod³a siê."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Konfigurowanie kopów jest tymczasowo wy³±czone."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Ustawianie opcji wiadomo¶ci jest tymczasowo wy³±czone."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Wysy³anie wiadomo¶ci jest tymczasowo wy³±czone."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Usuwanie nicków jest tymczasowo wy³±czone."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Grupowanie nicków jest tymczasowo wy³±czone."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Modyfikacja ustawieñ nicka jest tymczasowo wy³±czona."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Rejestracja nicków jest tymczasowo wy³±czona."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Rejestracja nicka nie powiod³a siê."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5263,12 +5187,12 @@ msgstr "Mo¿esz mieæ tylko %d wpisów na kana³owej li¶cie dostêpu."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Mo¿esz mieæ tylko %d wpisy(ów) na li¶cie dostêpu."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Mo¿esz mieæ tylko %d wpisów na kana³owej li¶cie dostêpu."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Mo¿esz mieæ jedynie %d wpisów w li¶cie AKICK."
@@ -5278,21 +5202,16 @@ msgstr "Mo¿esz mieæ jedynie %d wpisów w li¶cie AKICK."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "B³±d, mo¿esz mieæ tylko %d wpisów na li¶cie zakazanych s³ów."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "B³±d, ju¿ masz przekroczony limit %d kana³ów."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "B³±d, ju¿ masz osi±gniêty limit %d kana³ów."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Mo¿esz mieæ tylko %d wpisy(ów) na li¶cie dostêpu."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Statystyki zosta³y zresetowane."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status zaktualizowany (wiadomo¶ci, vhosty, flagi)."
 
@@ -5304,12 +5223,22 @@ msgstr "Przestañ floodowaæ!"
 msgid "Stop repeating yourself!"
 msgstr "Nie powtarzaj siê!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER ¦ci¶le kontroluje status w³a¶ciciela"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     ¦ci¶le kontroluje status operatorów"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Zastêpcê dla kana³u %s usuniêto."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Zastêpcê dla kana³u %s zmieniono na %s."
@@ -5318,21 +5247,38 @@ msgstr "Zastêpcê dla kana³u %s zmieniono na %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Opcja SuperAdmin nie jest w³±czona w pliku konfiguracyjnym."
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr ""
+"    SUSPEND     Blokuje podany nick z zachowaniem\n"
+"                wszelkich jego danych i ustawieñ"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "SYMBIOSIS"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Opcja SYMBIOSIS zosta³a w³±czona na kanale %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Opcja SYMBIOSIS zosta³a w³±czona na kanale %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Synchronizuje vhosty wszystkich nicków w grupie"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sk³adnia: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5359,7 +5305,7 @@ msgstr ""
 "2: ban w postaci *!*@host\n"
 "3: ban w postaci *!*ident@*.domena"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5371,7 +5317,7 @@ msgstr ""
 "\n"
 "Ustawia opis kana³u widoczny po wydaniu polecenia LIST oraz INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5384,7 +5330,7 @@ msgstr ""
 "Zmienia w³a¶ciciela kana³u.\n"
 "Nowy nick musi byæ zarejestrowany."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5402,7 +5348,7 @@ msgstr ""
 "temat za ka¿dym razem, gdy na kana³ bêdzie wchodziæ\n"
 "pierwsza osoba."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5419,7 +5365,7 @@ msgstr ""
 "informowa³ u¿ytkowników przebywaj±cych na kanale,\n"
 "kiedy zostanie u¿yta komenda OP lub DEOP."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5437,7 +5383,7 @@ msgstr ""
 "który ma poziom uprawnieñ wy¿szy lub równy\n"
 "korzystaj±c z poleceñ serwisu %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5482,7 +5428,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5497,7 +5444,7 @@ msgstr ""
 "umieszczany na listach wy¶wietlanych komend±:\n"
 "/msg %s LIST"
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5513,7 +5460,7 @@ msgstr ""
 "li¶cie dostêpu bêd± mog³y przebywaæ na kanale. Pozostali\n"
 "u¿ytkownicy bêd± banowani, a nastêpnie usuwani z kana³u."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5532,7 +5479,7 @@ msgstr ""
 "otrzymywaæ od serwisu %s uprawnienia\n"
 "wynikaj±ce z wpisów na li¶cie dostêpu."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5553,7 +5500,7 @@ msgstr ""
 "w³a¶ciciela oraz zastêpcy bêd± dostêpne tylko\n"
 "dla jednego u¿ytkownika."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5574,7 +5521,24 @@ msgstr ""
 "Je¿eli spadkobierca jest w³a¶cicielem zbyt du¿ej\n"
 "liczby kana³ów (%d) to kana³ zostanie odrejestrowany."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sk³adnia: %s kana³ TOPICLOCK {ON | OFF}\n"
+"\n"
+"W³±cza lub wy³±cza opcjê blokowania tematu kana³u.\n"
+"\n"
+"Je¶li ta opcja jest w³±czona, %s pozwoli na\n"
+"zmianê tematu tylko poprzez wydanie komendy TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5620,8 +5584,8 @@ msgstr ""
 "kana³u zosta³y wcze¶niej zmodyfikowane przy pomocy \n"
 "polecenia LEVELS."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5713,7 +5677,7 @@ msgstr ""
 "\n"
 "Polecenie ACCESS CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5761,7 +5725,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Wy¶wietla aktualn± listê dostêpu."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5773,7 +5737,7 @@ msgstr ""
 "Sprawia, ¿e bot u¿yje komendy akcji (/me) przy\n"
 "wypowiadaniu podanego tekstu na kanale."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5793,7 +5757,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5817,7 +5781,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5873,7 +5837,7 @@ msgstr ""
 "\n"
 "Polecenie AKICK CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5956,7 +5920,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR usuwa wszystkie wpisy z listy AKILL."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5992,7 +5956,7 @@ msgstr ""
 "        10. lub wy¿szy.\n"
 "Kana³y z opcj± NOEXPIRE bêd± oznaczone wykrzyknikiem."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6011,7 +5975,7 @@ msgstr ""
 "Parametr nick jest przeznaczony tylko dla\n"
 "administratorów serwisów."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6041,17 +6005,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sk³adnia: AOP kana³ ADD nick\n"
 "          AOP kana³ DEL {nick | numer | lista}\n"
@@ -6093,7 +6046,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %s HELP SET XOP"
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6105,8 +6058,8 @@ msgstr ""
 "\n"
 "Przydziela bota o wskazanym nicku na kana³."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6127,20 +6080,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Sk³adnia: BADWORDS kana³ ADD s³owo [SINGLE | START | END]\n"
 "          BADWORDS kana³ DEL {s³owo | numer-wpisu | lista}\n"
@@ -6174,7 +6113,7 @@ msgstr ""
 "\n"
 "BADWORDS CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6190,7 +6129,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6232,7 +6171,7 @@ msgstr ""
 "bota bêdzie u¿ywany przez innego u¿ytkownika,\n"
 "zostanie on wtedy skillowany."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6242,7 +6181,7 @@ msgstr ""
 "\n"
 "Listuje dostêpne w sieci boty."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6254,7 +6193,21 @@ msgstr ""
 "Wycofuje ostatni± wys³an± wiadomo¶æ,\n"
 "o ile nie zosta³a przeczytana."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6267,7 +6220,7 @@ msgstr ""
 "Na listê zostaj± dodane prawdziwe adresy (ident@host),\n"
 "po czym AKILL zostaje wykonany."
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6288,7 +6241,7 @@ msgstr ""
 "wskazany u¿ytkownik. Dodanie parametru SECRET ogranicza\n"
 "listê do kana³ów z flag± +s lub +p."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6300,7 +6253,7 @@ msgstr ""
 "Sprawdza, czy ostatnia wiadomo¶æ wys³ana do nick\n"
 "zosta³a przeczytana. Ta komenda nie dzia³a dla kana³ów."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6315,7 +6268,7 @@ msgstr ""
 "\n"
 "Standardowo ta komenda jest dostêpna tylko dla w³a¶ciciela kana³u."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6325,16 +6278,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6349,7 +6315,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6362,7 +6328,7 @@ msgstr ""
 "zdefiniowanych ograniczeñ dla serwisów podczas\n"
 "próby ataku na sieæ."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6387,7 +6353,7 @@ msgstr ""
 "posiadaj±ce 4. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6397,7 +6363,7 @@ msgstr ""
 "\n"
 "Usuwa vhosta przypisanego do wskazanego nicka."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6434,7 +6400,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Kasuje wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6445,7 +6411,7 @@ msgstr ""
 "\n"
 "Usuwa wszystkie vhosty grupy, do której nale¿y wskazany nick."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6467,7 +6433,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6488,7 +6454,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6509,7 +6475,7 @@ msgstr ""
 "wpisanych na listê SOP lub posiadaj±cych przynajmniej\n"
 "10. poziom dostêpu."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6534,7 +6500,7 @@ msgstr ""
 "posiadaj±ce 3. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6546,7 +6512,7 @@ msgstr ""
 "Usuwa podany kana³. Komenda mo¿e zostaæ u¿yta\n"
 "jedynie przez w³a¶ciciela kana³u."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6558,8 +6524,8 @@ msgstr ""
 "Usuwa wskazany kana³. Tylko administratorzy serwisów\n"
 "mog± usun±æ kana³, którego nie s± w³a¶cicielami."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6589,7 +6555,7 @@ msgstr ""
 "has³a. Aby uzyskaæ wiêcej informacji wpisz:\n"
 "/msg %s HELP IDENTIFY"
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6612,7 +6578,7 @@ msgstr ""
 "w jego grupie bez specjalnych uprawnieñ. Usuwanie\n"
 "dowolnego nicka jest ograniczone do administratorów."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6685,7 +6651,7 @@ msgstr ""
 "pierwszego wyj±tku o pasuj±cej masce. Du¿a lista wyj±tków i\n"
 "zbyt ogólne maski powoduj± pogorszenie wydajno¶ci serwisów."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6701,7 +6667,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6717,7 +6683,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6731,7 +6697,7 @@ msgstr ""
 "Uwaga: nie mo¿na u¿ywaæ symboli wieloznacznych (* lub ?).\n"
 "Ka¿dy przypadek u¿ycia tej komendy jest logowany."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6741,7 +6707,7 @@ msgstr ""
 "\n"
 "Zwraca has³o wstêpu do wskazanego kana³u."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6759,7 +6725,7 @@ msgstr ""
 "\n"
 "Ta komenda jest niedostêpna kiedy has³a s± szyfrowane."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6794,7 +6760,7 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6804,7 +6770,7 @@ msgstr ""
 "\n"
 "Listuje wszystkie nicki z Twojej grupy."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6836,7 +6802,7 @@ msgstr ""
 "Pozwala administratorom wysy³aæ wiadomo¶ci do wszystkich\n"
 "u¿ytkowników. Wiadomo¶æ zostanie wys³ana z nicka %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6849,7 +6815,8 @@ msgstr ""
 "To polecenie pozwala ustawiæ vhost bie¿±cego nicka\n"
 "dla wszystkich nicków w grupie."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6915,7 +6882,7 @@ msgstr ""
 "\n"
 "Uwaga: wszystkie nicki w grupie maj± to samo has³o."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6939,7 +6906,7 @@ msgstr ""
 "posiadaj±ce 4. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -6968,16 +6935,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sk³adnia: HOP kana³ ADD nick\n"
 "          HOP kana³ DEL {nick | numer | lista}\n"
@@ -7017,7 +6974,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %s HELP SET XOP"
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7035,7 +6992,7 @@ msgstr ""
 "przed ich u¿yciem. Has³em jest to samo has³o, \n"
 "którego u¿yto przy komendzie REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7045,7 +7002,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7078,7 +7035,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7099,7 +7056,7 @@ msgstr ""
 "Domy¶lnie parametr ALL jest dostêpny dla osób z\n"
 "uprawnieniami w³a¶ciciela kana³u."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7116,7 +7073,7 @@ msgstr ""
 "parametrem ALL otrzyma wszystkie mo¿liwe\n"
 "informacje - nawet je¶li zosta³y one ukryte."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7132,7 +7089,7 @@ msgstr ""
 "wiadomo¶ci. Je¶li podany zostanie kana³ wy¶wietlone \n"
 "informacje bêd± odnosi³y siê do wskazanego kana³u."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7158,7 +7115,7 @@ msgstr ""
 "Administratorzy serwisów mog± obejrzeæ informacje \n"
 "dot. dowolnych u¿ytkowników podaj±c parametr nick."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7178,7 +7135,7 @@ msgstr ""
 "pokazane informacje takie jak: data utworzenia,\n"
 "ilo¶æ obs³ugiwanych kana³ów itp."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7219,7 +7176,7 @@ msgstr ""
 "powód bêdzie on wy¶wietlany w polu informacyjnym serwera,\n"
 "w przeciwnym wypadku wy¶wietlane bêdzie \"Juped by <nick>\"."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7236,7 +7193,8 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7261,7 +7219,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7284,8 +7242,8 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7347,7 +7305,7 @@ msgstr ""
 "\n"
 "*** SpamMan has been kicked off channel #my_channel by %s (Alcan (Flood))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7365,7 +7323,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7382,7 +7340,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7410,7 +7368,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7427,7 +7385,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7451,7 +7409,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7467,7 +7425,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7484,7 +7442,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7501,7 +7459,7 @@ msgstr ""
 "zostanie wykopany zanim bot za³o¿y bana.\n"
 "Pominiêcie parametru ttb wy³±cza banowanie."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7554,7 +7512,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7582,7 +7540,7 @@ msgstr ""
 "Maksymalna d³ugo¶æ listy wy¶wietlanej operatorowi podczas\n"
 "jednego zapytania jest okre¶lona przez ustawienie NSListMax."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7598,7 +7556,7 @@ msgstr ""
 "Poprzedzenie znakiem '#' powoduje podawanie zakresu,\n"
 "nazwy kana³ów powinny byæ pisane bez znaku '#'."
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7639,7 +7597,7 @@ msgstr ""
 "        Lista wszystkich nicków z mask± domeny\n"
 "        ircnet.pl"
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7698,7 +7656,7 @@ msgstr ""
 "        Lista wszystkich nicków z mask± domeny\n"
 "        ircnet.pl"
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7720,11 +7678,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      Wy¶wietli wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "LOGONNEWS ADD tekst"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7756,7 +7724,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "LOGONNEWS DEL {numer | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7771,7 +7739,7 @@ msgstr ""
 "tego polecenia nie bêdziesz rozpoznawany jako\n"
 "w³a¶ciciel nicka."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7794,21 +7762,7 @@ msgstr ""
 "REVALIDATE powoduje informowanie przez serwisy\n"
 "u¿ytkownika o potrzebie ponownej identyfikacji."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sk³adnia: MODE kana³ flagi\n"
-"\n"
-"Pozwala operatorom serwisów na zmianê flag dla wskazanego\n"
-"kana³u. Parametry s± identyczne jak dla komendy /MODE."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7835,7 +7789,21 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Sk³adnia: MODE kana³ flagi\n"
+"\n"
+"Pozwala operatorom serwisów na zmianê flag dla wskazanego\n"
+"kana³u. Parametry s± identyczne jak dla komendy /MODE."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7845,7 +7813,7 @@ msgstr ""
 "\n"
 "To polecenie wy¶wietla informacje na temat za³adowanego modu³u"
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7855,7 +7823,7 @@ msgstr ""
 "\n"
 "Listuje za³adowane modu³y."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7866,7 +7834,7 @@ msgstr ""
 "\n"
 "To polecenie ³aduje wskazany modu³ z katalogu modu³ów."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7877,7 +7845,7 @@ msgstr ""
 "\n"
 "To polecenie ³aduje wskazany modu³ z katalogu modu³ów."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7888,7 +7856,7 @@ msgstr ""
 "\n"
 "To polecenie wy³aduje wskazany modu³."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7916,7 +7884,7 @@ msgstr ""
 "\n"
 "Uwaga: Serwisy nie sprawdzaj± warto¶ci serwer."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7929,7 +7897,7 @@ msgstr ""
 "Po u¿yciu tego polecenia ka¿dy bêdzie móg³ sprawdziæ Twój\n"
 "prawdziwy adres u¿ywaj±c polecenia /WHOIS."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -7944,7 +7912,7 @@ msgstr ""
 "flagami. Flagi powinny byæ poprzedzone znakami \"+\" lub \"-\". \n"
 "Aby usun±æ wszystkie flagi wystarczy podaæ \"-\"."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -7957,7 +7925,7 @@ msgstr ""
 "Po u¿yciu tego polecenia Twój prawdziwy adres zostanie \n"
 "zast±piony vhostem."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -7983,7 +7951,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "OPERNEWS ADD tekst"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8015,7 +7983,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "OPERNEWS DEL {numer | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8036,7 +8004,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8058,7 +8026,7 @@ msgstr ""
 "wpisanych na listê SOP lub posiadaj±cych przynajmniej\n"
 "10. poziom dostêpu."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8087,16 +8055,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8135,7 +8093,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8157,7 +8115,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "RANDOMNEWS ADD tekst"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8183,7 +8141,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "RANDOMNEWS DEL {numer | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8208,7 +8166,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      Wy¶wietli wiadomo¶ci od numeru 2 do 5 oraz od 7 do 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8254,8 +8213,8 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8297,8 +8256,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8363,7 +8322,7 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji napisz: \n"
 "/msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8393,7 +8352,7 @@ msgstr ""
 "   do której nale¿y wskazany nick,\n"
 "3. podasz prawid³owe has³o do nicka."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8407,7 +8366,7 @@ msgstr ""
 "Niektóre opcje wci±¿ wymagaj± restartu serwisów\n"
 "(zmiana nicków serwisów, aktywacja limitów sesji itd.)."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8419,7 +8378,7 @@ msgstr ""
 "To polecenie powoduje ponowne wys³anie kodu autoryzuj±cego\n"
 "na adres e-mail u¿ytkownika, który wydaje polecenie."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8441,7 +8400,7 @@ msgstr ""
 "\n"
 "Wymusza zapisanie baz, a nastêpnie restartuje serwisy."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8464,7 +8423,7 @@ msgstr ""
 "automatyczne potwierdzenie odbioru zostanie wys³ane\n"
 "do nadawcy."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8476,7 +8435,7 @@ msgstr ""
 "Ustawia ró¿ne opcje nicka wskazanemu u¿ytkownikowi.\n"
 "Dostêpne opcje to:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8490,7 +8449,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne nadawanie uprawnieñ\n"
 "wskazanemu u¿ytkownikowi przy wchodzeniu na kana³."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8503,7 +8462,7 @@ msgstr ""
 "u¿ytkownika na now±. Nazwa MUSI byæ jednym z nicków\n"
 "nale¿±cych do tej grupy."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8513,7 +8472,7 @@ msgstr ""
 "\n"
 "Przypisuje wskazanemu u¿ytkownikowi adres e-mail."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8529,7 +8488,7 @@ msgstr ""
 "oraz u¿ytkownik ma odpowiedni poziom dostêpu to\n"
 "wtedy ta wiadomo¶æ bêdzie wysy³ana na kana³ przez bota."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8552,7 +8511,7 @@ msgstr ""
 "dostêpu do serwisów. Drugi argument okre¶la, czy dana \n"
 "informacja bêdzie pokazywana (OFF), czy ukrywana (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8587,24 +8546,7 @@ msgstr ""
 "nale¿y stosowaæ z rozwag±). Administrator sieci \n"
 "mo¿e wy³±czyæ korzystanie z IMMED."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Sk³adnia: SASET nick LANGUAGE numer\n"
-"\n"
-"Zmienia jêzyk jakiego u¿ywaj± serwisy komunikuj±c \n"
-"siê ze wskazan± osob±. Numer musi byæ wybrany z\n"
-"listy obs³ugiwanych jêzyków, która jest dostêpna\n"
-"po wydaniu polecenia /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8619,7 +8561,7 @@ msgstr ""
 "w³±czona serwisy bêd± wysy³aæ wiadomo¶ci prywatne\n"
 "w przeciwnym wypadku bêd± wysy³aæ powiadomienia."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8631,7 +8573,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne usuniêcie nicka,\n"
 "je¶li nie bêdzie on u¿ywany."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8642,7 +8584,7 @@ msgstr ""
 "\n"
 "Zmienia has³o wskazanemu u¿ytkownikowi."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8661,7 +8603,7 @@ msgstr ""
 "Jednak ka¿dy, kto zna nick mo¿e uzyskaæ o nim\n"
 "informacje u¿ywaj±c polecenia INFO."
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8684,7 +8626,7 @@ msgstr ""
 "znajduje siê na li¶cie %s nie skilluje\n"
 "u¿ytkownika niezale¿nie od ustawienia opcji KILL."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8694,7 +8636,7 @@ msgstr ""
 "\n"
 "Wypowiada przez bota podany tekst na kanale."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8711,7 +8653,7 @@ msgstr ""
 "wiadomo¶ci (o ile ma w³±czone powiadomienia).\n"
 "Adresatem musi byæ zarejestrowany nick lub kana³."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8722,7 +8664,7 @@ msgstr ""
 "\n"
 "Wysy³a wiadomo¶æ do wszystkich zarejestrowanych u¿ytkowników."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8741,7 +8683,7 @@ msgstr ""
 "Ta komenda w niektórych sieciach mo¿e byæ dostêpna\n"
 "jedynie dla osób z uprawnieniami IRC operatora."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8773,7 +8715,7 @@ msgstr ""
 "Wiêcej informacji na temat ograniczania liczby sesji\n"
 "znajduje siê w pomocy polecenia EXCEPTION."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8788,7 +8730,7 @@ msgstr ""
 "polecenia SET <nick> <ident>@<vhost>\n"
 "mo¿na zmieniaæ tak¿e ident."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8804,8 +8746,8 @@ msgstr ""
 "na li¶cie dostêpu kana³u (ACCESS LIST) nie bêd±\n"
 "mogli posiadaæ statusu operatora."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8829,26 +8771,9 @@ msgstr ""
 "podpisywane. Aby uzyskaæ wiêcej informacji wpisz:\n"
 "/msg %s HELP LEVELS"
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sk³adnia: %s kana³ TOPICLOCK {ON | OFF}\n"
-"\n"
-"W³±cza lub wy³±cza opcjê blokowania tematu kana³u.\n"
-"\n"
-"Je¶li ta opcja jest w³±czona, %s pozwoli na\n"
-"zmianê tematu tylko poprzez wydanie komendy TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8881,7 +8806,7 @@ msgstr ""
 "Informacja: dostêp do tej komendy jest kontrolowany\n"
 "przez poziom SET."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8893,7 +8818,7 @@ msgstr ""
 "wskazanego bota dla u¿ytkowników nie bêd±cych\n"
 "IRC operatorami."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8909,7 +8834,7 @@ msgstr ""
 "\n"
 "Dostêpne opcje:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8923,7 +8848,7 @@ msgstr ""
 "posiadaj±cych status operatora nawet je¶li nie\n"
 "przys³uguje im poziom dostêpu NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -8937,7 +8862,7 @@ msgstr ""
 "posiadaj±cych prawo g³osu nawet je¶li nie\n"
 "przys³uguje im poziom dostêpu NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -8966,7 +8891,7 @@ msgstr ""
 "do wydania danego polecenia (np. aby u¿ywac !deop\n"
 "trzeba posiadaæ poziom dostêpu OPDEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -8981,7 +8906,7 @@ msgstr ""
 "ich w³asn± wiadomo¶ci± powitaln±. U¿ytkownik zostanie\n"
 "powitany, je¶li bêdzie mia³ odpowiedni poziom dostêpu."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -8996,7 +8921,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9010,7 +8935,7 @@ msgstr ""
 "nie wolno przypisywaæ botów. Je¶li w danej chwili\n"
 "bot jest przypisany do kana³u, zostanie usuniêty."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9022,7 +8947,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne usuniêcie kana³u,\n"
 "je¶li nie bêdzie on u¿ywany."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9039,8 +8964,8 @@ msgstr ""
 "które wykonywa³ %s (np. opowanie) bêd±\n"
 "wykonywane przez bota."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9066,7 +8991,7 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %s HELP SET opcja"
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9076,7 +9001,7 @@ msgstr ""
 "\n"
 "Ustawia ró¿ne opcje nicka. Dostêpne opcje to:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9100,7 +9025,7 @@ msgstr ""
 "    IGNORE     W³±cza lub wy³±cza tryb ignorowania\n"
 "    LIST       Listuje aktualne ustawienia"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9112,7 +9037,7 @@ msgstr ""
 "W³±cza lub wy³±cza automatyczne nadawanie uprawnieñ\n"
 "przy wchodzeniu na kana³."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9125,7 +9050,7 @@ msgstr ""
 "serwisach na now±. Nazwa MUSI byæ jednym z nicków\n"
 "nale¿±cych do Twojej grupy."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9139,7 +9064,7 @@ msgstr ""
 "bêdzie wy¶wietlany przy opisie Twojego nicka\n"
 "dostêpnym przy u¿yciu komendy INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9155,7 +9080,7 @@ msgstr ""
 "u¿ytkowników oraz masz odpowiedni poziom dostêpu to\n"
 "wtedy ta wiadomo¶æ bêdzie wysy³ana na kana³ przez bota."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9178,7 +9103,7 @@ msgstr ""
 "dostêpu do serwisów. Drugi argument okre¶la, czy dana \n"
 "informacja bêdzie pokazywana (OFF), czy ukrywana (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9213,7 +9138,7 @@ msgstr ""
 "nale¿y stosowaæ z rozwag±). Administrator sieci \n"
 "mo¿e wy³±czyæ korzystanie z IMMED."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9230,7 +9155,7 @@ msgstr ""
 "wys³an± przez Ciebie komendê). Numer mo¿e byæ \n"
 "wybrany z poni¿szej listy obs³ugiwanych jêzyków:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9247,7 +9172,7 @@ msgstr ""
 "przyjmowanie wiadomo¶ci zostanie wy³±czone. Limit \n"
 "nie mo¿e byæ wiêkszy ni¿ %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9287,7 +9212,7 @@ msgstr ""
 "limitu, a tak¿e ustaliæ jego warto¶ci powy¿ej %d \n"
 "oraz u¿yæ parametru HARD."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9297,7 +9222,7 @@ msgstr ""
 "\n"
 "Listuje aktualne ustawienia serwisu %s."
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9312,7 +9237,7 @@ msgstr ""
 "wysy³aæ wiadomo¶ci prywatne (query), w przeciwnym\n"
 "wypadku bêd± wysy³aæ powiadomienia (notice)."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9330,7 +9255,7 @@ msgstr ""
 "\n"
 "Ta opcja ma taki sam efekt jak argument linii poleceñ -noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9369,7 +9294,7 @@ msgstr ""
 "\n"
 "Opcja ON jest kombinacj± opcji LOGON oraz NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9380,7 +9305,7 @@ msgstr ""
 "\n"
 "Zmienia Twoje has³o do nicka."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9399,7 +9324,7 @@ msgstr ""
 "Jednak ka¿dy, kto zna nick mo¿e uzyskaæ o nim\n"
 "informacje u¿ywaj±c polecenia INFO."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9428,7 +9353,7 @@ msgstr ""
 "\n"
 "Ta opcja ma taki sam efekt jak argument linii poleceñ -readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9451,7 +9376,7 @@ msgstr ""
 "znajduje siê na li¶cie %s nie skilluje\n"
 "u¿ytkownika niezale¿nie od ustawienia opcji KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9468,7 +9393,7 @@ msgstr ""
 "Ta opcja powinna byæ u¿ywana tylko wtedy, kiedy\n"
 "jest taka potrzeba. Nale¿y j± pó¼niej wy³±czyæ."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9489,7 +9414,7 @@ msgstr ""
 "UWAGA: to polecenie nie spowoduje zmiany vhosta\n"
 "dla nicka, który pó¼niej zostanie dodany do grupy."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9499,7 +9424,7 @@ msgstr ""
 "\n"
 "Wymusza zapisanie baz danych, a nastêpnie wy³±cza serwisy."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9585,7 +9510,7 @@ msgstr ""
 "\n"
 "SNLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9615,16 +9540,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sk³adnia: SOP kana³ ADD nick\n"
 "          SOP kana³ DEL {nick | numer | lista}\n"
@@ -9664,7 +9579,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %s HELP SET XOP"
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9752,7 +9667,7 @@ msgstr ""
 "datê wyga¶niêcia, maskê oraz powód.\n"
 "SQLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9762,7 +9677,7 @@ msgstr ""
 "\n"
 "Wy¶wietla nicki obs³ugi serwisów, poziom i status online."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9776,7 +9691,7 @@ msgstr ""
 "wpisani jednocze¶nie na kilka list otrzymaj±\n"
 "wiadomo¶ci kilka razy."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9823,7 +9738,7 @@ msgstr ""
 "\n"
 "Parametr ALL wy¶wietla wszystkie dostêpne informacje."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9849,7 +9764,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR informacja-o-b³êdzie"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9894,7 +9809,7 @@ msgstr ""
 "Reszta bêdzie ignorowana. Je¶li nie zostanie podany\n"
 "¿aden nick zostanie zwrócony twój status."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9912,7 +9827,7 @@ msgstr ""
 "\n"
 "W niektórych sieciach wymagane jest podanie powodu."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -9922,7 +9837,7 @@ msgstr ""
 "\n"
 "Zmienia nick wskazanemu u¿ytkownikowi."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10003,7 +9918,8 @@ msgstr ""
 "datê wyga¶niêcia, maskê oraz powód.\n"
 "SZLINE CLEAR usuwa wszystkie wpisy z listy."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10026,21 +9942,7 @@ msgstr ""
 "\n"
 "Standardowo ta komenda jest dostêpna dla w³a¶ciciela kana³u."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sk³adnia: UMODE u¿ytkownik flagi\n"
-"\n"
-"Pozwala Services Operators zmieniaæ flagi\n"
-"innym u¿ytkownikom. Parametry s± identyczne jak\n"
-"dla komendy /MODE."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10056,7 +9958,7 @@ msgstr ""
 "Bêdzie mo¿na go ponownie przydzieliæ w ka¿dej\n"
 "chwili, bez potrzeby ponownego konfigurowania."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10076,7 +9978,7 @@ msgstr ""
 "wpisanych na listê AOP lub posiadaj±cych poziom\n"
 "dostêpu 5 lub wy¿szy."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10093,7 +9995,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10105,7 +10007,7 @@ msgstr ""
 "Uwalnia zawieszony kana³. Wszystkie dane i ustawienia\n"
 "s± odtworzone sprzed zawieszenia."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10116,7 +10018,7 @@ msgstr ""
 "\n"
 "Wymusza natychmiastowy zapis baz danych na dysku."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10138,7 +10040,7 @@ msgstr ""
 "listuje u¿ytkowników przebywaj±cych na wskazanym kanale.\n"
 "Dodanie parametru INVISIBLE listuje tylko u¿ytkowników z flag± +i."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10163,7 +10065,7 @@ msgstr ""
 "posiadaj±ce 3. poziom dostêpu mog± j± wykonywaæ\n"
 "jedynie na sobie."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10192,16 +10094,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sk³adnia: VOP kana³ ADD nick\n"
 "          VOP kana³ DEL {nick | numer | lista}\n"
@@ -10242,7 +10134,7 @@ msgstr ""
 "Aby dowiedzieæ siê jak w³±czyæ tryb xOP wpisz:\n"
 "/msg %s HELP SET XOP"
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10258,7 +10150,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10267,7 +10159,7 @@ msgstr ""
 "\n"
 "Zawiesza nick uniemo¿liwiaj±c identyfikacjê."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10276,7 +10168,7 @@ msgstr ""
 "\n"
 "Uwalnia zawieszony nick."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10289,51 +10181,94 @@ msgstr ""
 "wiadomo¶ci, ustawia odpowiednie uprawnienia na kana³ach,\n"
 "aktualizuje vhosta oraz flagi u¿ytkownika."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kana³ [temat]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR       Usuwa wskazane obiekty z kana³u"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE      Zaprasza osobê wydaj±c± polecenie na kana³"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr "    NOOP        Tymczasowo usuwa wszystkie O:linie na serwerze"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Wy³±cza serwisy z zapisaniem baz"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Wy³±cza serwisy bez zapisywania baz"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "Opcja IMMED nie jest jest dostêpna w tej sieci."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Lista AKILL zosta³a wyczyszczona."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Defcon jest teraz na poziomie: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "Adres e-mail osoby %s bêdzie ukrywany w informacjach %s."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "Adres e-mail osoby %s bêdzie pokazywany w informacjach %s."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "Lista SNLINE zosta³a wyczyszczona."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "Lista SQLINE zosta³a wyczyszczona."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "Lista SZLINE zosta³a wyczyszczona."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Kana³ %s nie posiada klucza."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10344,89 +10279,79 @@ msgstr ""
 "Poziomy dla AUTODEOP oraz NOJOIN to poziomy maksymalne,\n"
 "reszta uprawnieñ ma poziomy minimalne."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Host %s aktualnie posiada %d sesji z limitem %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "Ostatnia wiadomo¶æ wys³ana do %s (w %s) zosta³a przeczytana."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Ostatnia wys³ana przez Ciebie wiadomo¶æ\n"
 "do %s (w %s) jest wci±¿ nieprzeczytana."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "Ostatnia wiadomo¶æ QUIT osoby %s bêdzie ukrywana w informacjach %s."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "Ostatnia wiadomo¶æ QUIT osoby %s bêdzie pokazywana w informacjach %s."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr "Ostatnia maska ident@host osoby %s bêdzie ukrywana w informacjach %s."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "Ostatnia maska ident@host osoby %s bêdzie pokazywana w informacjach %s."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Limit wiadomo¶ci dla %s nie mo¿e byæ zmieniany."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "Nowa nazwa dla %s MUSI byæ jednym z nicków w grupie!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Now± nazw± jest %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Nick %s zostaje zmieniony na %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr "Status dostêpu do serwisów osoby %s bêdzie ukrywany w informacjach %s."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Status dostêpu do serwisów osoby %s bêdzie pokazywany w informacjach %s."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Jest %d wiadomo¶ci dla kana³u %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10434,7 +10359,8 @@ msgstr ""
 "Obecnie nie ma ¿adnych botów dostêpnych.\n"
 "Popro¶ administratora serwisów o dodanie."
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10444,20 +10370,12 @@ msgstr ""
 "Napisz /msg %s HELP GLIST i /msg %s HELP DROP,\n"
 "aby uzyskaæ wiêcej informacji."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Jest %d wiadomo¶æ dla kana³u %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Jest nowa wiadomo¶æ dla kana³u %s.\n"
-"Napisz /msg %s READ %s %d aby j± przeczytaæ."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Nie ma ¿adnych botów przydzielonych do %s."
@@ -10478,7 +10396,7 @@ msgstr "Nie ma losowych wiadomo¶ci."
 msgid "There's no email address set for your nick."
 msgstr "Twój nick nie ma ustawionego adresu e-mail."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10493,81 +10411,38 @@ msgstr ""
 "   PRIVATE   Zastrzega przypisywanie bota tylko dla IRC\n"
 "             Operatorów"
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Ten kana³ zosta³ zablokowany."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Ten kana³ zosta³ zarejestrowany z %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Ten kana³ zosta³ zawieszony."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Ten kana³ nie mo¿e byæ u¿ywany."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Ten kana³ nie wyga¶nie."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr "Ten nick zosta³ ju¿ zarejestrowany. Sprawd¼ swoj± pocztê."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Ten nick czeka na e-mail z kodem weryfikacyjnym przed zakoñczeniem "
-"rejestracji."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Ten nick jest zarejestrowany. Je¶li to Twój nick,\n"
-"wpisz: /msg %s IDENTIFY has³o"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Ten nick zosta³ zarejestrowany i nie mo¿esz go u¿ywaæ."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Ten nick jest obecnie zawieszony"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Ten nick jest obecnie zawieszony, powód: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Ten nick jest zarejestrowany i chroniony.\n"
-"Zidentyfikuj siê pisz±c: /msg %s IDENTIFY has³o\n"
-"je¶li nick nale¿y do Ciebie, w przeciwnym razie zmieñ go."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Ten nick nie wyga¶nie."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Ten nick nie mo¿e byæ u¿ywany. Wybierz inny nick."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Ten nick nie wyga¶nie."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10575,30 +10450,62 @@ msgstr ""
 "Aby wyszukaæ kana³y o nazwach zaczynaj±cych siê znakiem #\n"
 "nale¿y ten znak pomin±æ (anope zamiast #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr ""
+"    XOP           W³±cza system uprawnieñ xOP\n"
+"                  (u¿ycie komend SOP, AOP, HOP, VOP)"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "TOPICLOCK"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "KEEPTOPIC"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Ogranicza mo¿liwo¶æ zmiany tematu"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Blokada tematu na kanale %s zosta³a w³±czona."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic lock option for %s is now on."
+msgstr "Blokada tematu na kanale %s zosta³a w³±czona."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Temat kana³u %s bêdzie teraz utrzymywany."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Temat kana³u %s bêdzie teraz utrzymywany."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Wy³±cz CAPS LOCKa!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     W³±cza lub wy³±cza bezpieczeñstwo nicka"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       W³±cza lub wy³±cza ochronê nicka"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10612,7 +10519,8 @@ msgstr ""
 "    poziom dostêpu na kanale mo¿e czytaæ wiadomo¶ci,\n"
 "    ale mo¿na to zmieniæ komend± LEVELS serwisu %s."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10621,7 +10529,8 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %s HELP SASET opcja"
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10629,7 +10538,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10637,132 +10547,132 @@ msgstr ""
 "Aby uzyskaæ wiêcej informacji o danej opcji wpisz:\n"
 "/msg %s HELP SET opcja"
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Napisz /msg %s SET EMAIL e-mail, aby ustawiæ adres e-mail.\n"
-"Twoja prywatno¶æ bêdzie uszanowana - nie bêdzie podawany osobom trzecim,"
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr ""
 "Napisz /msg %s LIST NEW,\n"
 "aby zobaczyæ listê nowych wiadomo¶ci."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Napisz /msg %s READ %d aby przeczytaæ."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Napisz /msg %s READ LAST aby przeczytaæ."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick flagi"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Napisz /msg %s SET EMAIL e-mail, aby ustawiæ adres e-mail.\n"
+"Twoja prywatno¶æ bêdzie uszanowana - nie bêdzie podawany osobom trzecim,"
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kana³"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kana³ [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND kana³"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Wy³adowuje modu³"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Nie mo¿na za³adowaæ modu³u %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Nie mo¿na wy³adowaæ modu³u %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "    UNASSIGN       Usuwa bota z kana³u"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Nieznana opcja komendy SASET %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Nieznana opcja komendy SET %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Nieznana opcja STATS %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Nieznana komenda %s. Napisz \"/msg %s HELP\" aby uzyskaæ pomoc."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Nieznany flaga %c zostaje zignorowana."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Nieznana opcja %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND   Uwalnia zawieszonego nicka"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Nieznana opcja %s.\n"
-"Napisz /msg %s HELP SET, aby uzyskaæ wiêcej informacji."
+"    UPDATE      Aktualizuje twój obecny status np.\n"
+"                sprawdza nowe wiadomo¶ci"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Aktualizacja baz danych."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab  : %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Pod³±czony do: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "U¿ytkownicy   : %6d rekordów, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"Twój nick zosta³ w³a¶nie przejêty przez serwisy.\n"
-"Napisz /msg %s RELEASE %s, je¶li nie chcesz czekaæ %s sekund na jego "
-"automatyczne zwolnienie."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "U¿ytkownik posiada wyj±tek na kanale."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10770,16 +10680,35 @@ msgstr ""
 "Lista u¿ytkowników:\n"
 "Nick                 Maska"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #kana³ [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "W³a¶cicielem kana³u %s jest teraz %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Wy¶wietla listê sesji"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE       Nadaje wskazanej osobie prawo g³osu"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "DONTKICKVOICES"
 
@@ -10806,16 +10735,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Uwa¿aj co piszesz!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Nale¿ysz ju¿ do grupy %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Jeste¶ ju¿ zidentyfikowany(a)."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "Przebywasz ju¿ na kanale %s! "
@@ -10824,11 +10753,7 @@ msgstr "Przebywasz ju¿ na kanale %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Nie jeste¶ ju¿ d³u¿ej super-administratorem."
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Nie masz pozwolenia, aby przebywaæ na tym kanale."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Nie mo¿esz zmieniaæ swojego limitu wiadomo¶ci."
 
@@ -10836,11 +10761,12 @@ msgstr "Nie mo¿esz zmieniaæ swojego limitu wiadomo¶ci."
 msgid "You are now a SuperAdmin"
 msgstr "Jeste¶ teraz super-administratorem."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Jeste¶ teraz IRC operatorem."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10848,41 +10774,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Nale¿ysz teraz do grupy %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "Nie mo¿na wykluczyæ samych serwisów lub uplinka serwisów."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "Nie mo¿esz wysy³aæ wiadomo¶ci z potwierdzeniem odbioru do siebie!"
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Nie mo¿esz usun±æ samego siebie!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Nie mogê wylogowaæ %s, bo to administrator serwisów."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Nie mo¿esz odzyskaæ nicka, którego w³a¶nie u¿ywasz!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10892,7 +10819,8 @@ msgstr ""
 "Musisz u¿yæ poleceñ VOP, AOP lub SOP.\n"
 "Napisz /msg %s HELP komenda, aby uzyskaæ wiêcej informacji."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10903,6 +10831,7 @@ msgstr ""
 "Napisz /msg %s HELP komenda, aby uzyskaæ wiêcej informacji."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -10910,56 +10839,66 @@ msgstr ""
 "Nie mo¿esz u¿yæ tej komendy. U¿yj komendy ACCESS.\n"
 "Napisz /msg %s HELP ACCESS, aby uzyskaæ wiêcej informacji."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Nie mo¿esz ustawiæ limitu wiadomo¶ci dla %s wiêkszego ni¿ %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Nie mo¿esz ustawiæ swojego limitu wiadomo¶ci wiêkszego ni¿ %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Nie mo¿esz usuwaæ adresu e-mail w tej sieci."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Aktualnie masz %d wiadomo¶ci, z czego %d jest nieprzeczytanych."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Aktualnie masz %d wiadomo¶ci, w tym jedn± nieprzeczytan±."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Aktualnie masz %d wiadomo¶ci."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Aktualnie masz %d nieprzeczytanych wiadomo¶ci."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Aktualnie masz jedn± wiadomo¶æ i jest ona nieprzeczytana."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Aktualnie masz jedn± wiadomo¶æ."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Aktualnie nie masz wiadomo¶ci."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -10969,63 +10908,44 @@ msgstr "Masz %d nowe(ych) wiadomo¶ci."
 msgid "You have 1 new memo."
 msgstr "Masz jedn± now± wiadomo¶æ."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Nasz now± wiadomo¶æ od %s.\n"
-"Napisz /msg %s READ %d aby j± przeczytaæ."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Zosta³e¶ zaproszony do %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Ban na kanale %s zosta³ zdjêty."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Nie masz limitu wiadomo¶ci, które mo¿esz trzymaæ."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Nie masz wiadomo¶ci."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Nie masz nowych wiadomo¶ci."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Musisz podaæ prawid³ow± liczbê dla czasu."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Musisz najpierw przydzieliæ bota do kana³u.\n"
-"Napisz /msg %s HELP ASSIGN, aby uzyskaæ wiêcej informacji."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Aby zarejestrowaæ kana³ musisz byæ jego operatorem."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Aby zarejestrowaæ kana³ musisz byæ jego operatorem."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Musisz byæ po³±czony(a) d³u¿ej ni¿ %d sekund(y), aby móc zarejestrowaæ nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11034,26 +10954,26 @@ msgstr ""
 "Teraz ustaw adres e-mail dla Twojego nicka.\n"
 "Gdy zapomnisz has³a, zostanie ono wys³ane na e-mail."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Bêdziesz powiadomienie informacje o nowych wiadomo¶ciach\n"
 "podczas logowania i w momencie ich nadej¶cia."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr ""
 "Bêdziesz otrzymywaæ powiadomienie o nowych wiadomo¶ciach podczas logowania."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Bêdziesz otrzymywaæ powiadomienie o nowych wiadomo¶ciach."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Nie bêdziesz ju¿ d³u¿ej odbieraæ wiadomo¶ci."
 
@@ -11062,7 +10982,7 @@ msgid "You will no longer be informed via email."
 msgstr ""
 "Powiadomienie o nowych wiadomo¶ciach nie bêd± wysy³ane na adres e-mail."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Nie bêdziesz otrzymywaæ informacji o nowych wiadomo¶ciach."
 
@@ -11070,17 +10990,20 @@ msgstr "Nie bêdziesz otrzymywaæ informacji o nowych wiadomo¶ciach."
 msgid "You will now be informed about new memos via email."
 msgstr "Powiadomienie o nowych wiadomo¶ciach bêd± wysy³ane na adres e-mail."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Twoje IRCD nie obs³uguje vIdentów, je¶li nie jest to prawda zg³o¶ b³±d."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Twoja lista dostêpu jest pusta."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Jeste¶ ju¿ zidentyfikowany(a)."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11096,35 +11019,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Twoja lista dostêpu jest pusta."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "Adres e-mail osoby %s zosta³ zmieniony na %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Wszystkie O:linie %s zosta³y usuniête."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Lista ignorowanych jest pusta."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Twój limit wiadomo¶ci zosta³ wy³±czony."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Twój limit wiadomo¶ci zosta³ zmieniony na %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Twój limit wiadomo¶ci wynosi %d i nie mo¿e byæ zmieniony."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Twój limit wiadomo¶ci wynosi %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Twój limit wiadomo¶ci wynosi 0, nie bêdziesz otrzymywaæ nowych."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11132,61 +11076,57 @@ msgstr ""
 "Twój limit wiadomo¶ci wynosi 0, nie bêdziesz odbieraæ nowych i nie mo¿esz "
 "zmieniæ tego limitu."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Twój nick zosta³ pomy¶lnie wylogowany."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Twój nick jest ju¿ zarejestrowany. Napisz najpierw: /msg %s DROP"
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Twój nick nie jest zarejestrowany."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Twój nick zosta³ odrejestrowany."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Twój nick zosta³ zmieniony na %s."
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Twój kod rejestracyjny zosta³ ponownie wys³any na %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Twoje has³o do nicka to %s"
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Twoje has³o jest za d³ugie. Spróbuj ponownie z krótszym has³em."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Twój vhost %s jest teraz aktywny."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Twój vhost %s@%s jest teraz aktywny."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr ""
 "Twój vhost zosta³ usuniêty i zosta³o w³±czone normalne ukrywanie hosta."
@@ -11206,94 +11146,95 @@ msgstr "[Wiadomo¶æ dla operatorów - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Losowa wiadomo¶æ - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "nie wygasa"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "wygasa przy nastêpnej aktualizacji baz"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "wygasa za %d dzieñ"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "wygasa za %d dni"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "wygasa za %d godzinê i %d minutê"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "wygasa za %d godzinê i %d minut(y)"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "wygasa za %d godzinê i %d minut(y)"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "wygasa za %d godzin(y) i %d minut(y)"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "wygasa za %d minutê"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "wygasa za %d minut(y)"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Vhost dla %s zosta³ usuniêty."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Vhost dla %s zosta³ zmieniony na %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Vhost dla %s zosta³ zmieniony na %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Vhosty dla grupy %s zosta³y zmienione na %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Vhosty dla grupy %s zosta³y zmienione na %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Vhosty dla grupy %s zosta³y usuniête."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "XOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "System list xOP na kanale %s zosta³ w³±czony."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "System list xOP na kanale %s zosta³ w³±czony."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "System xOP nie jest dostêpny."
 
@@ -11302,560 +11243,3 @@ msgstr "System xOP nie jest dostêpny."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | kana³} tre¶æ"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s dodano do listy AOP kana³u %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s dodano do listy HOP kana³u %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s dodano do listy SOP kana³u %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s dodano do listy VOP kana³u %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s usuniêto z listy HOP kana³u %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s usuniêto z listy SOP kana³u %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s usuniêto z listy VOP kana³u %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s przeniesiono do listy HOP kana³u %s."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s przeniesiono do listy SOP kana³u %s."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s przeniesiono do listy VOP kana³u %s."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s nie znaleziono na li¶cie HOP kana³u %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s nie znaleziono na li¶cie SOP kana³u %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s nie znaleziono na li¶cie VOP kana³u %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Ustawia jêzyk w którym serwisy bêd±\n"
-#~ "               wysy³a³y komunikaty"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Zapobiega wy¶wietlaniu nicka po wydaniu\n"
-#~ "               polecenia: /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d dni"
-
-#~ msgid "%d hours"
-#~ msgstr "%d godzin(y)"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minut(y)"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d sekund(y)"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "Lista HOP kana³u %s jest pusta."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "Lista SOP kana³u %s jest pusta."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "Lista VOP kana³u %s jest pusta."
-
-#~ msgid "1 day"
-#~ msgstr "1 dzieñ"
-
-#~ msgid "1 hour"
-#~ msgstr "1 godzina"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minuta"
-
-#~ msgid "1 second"
-#~ msgstr "1 sekunda"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Pozwala u¿ywaæ komendy CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Pozwala u¿ywaæ komend HALFOP i DEHALFOP na innych osobach"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Lista HOP kana³u %s zosta³a wyczyszczona."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Lista SOP kana³u %s zosta³a wyczyszczona."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Lista VOP kana³u %s zosta³a wyczyszczona."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "Usuniêto %d wpisów(y) z listy HOP kana³u %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "Usuniêto %d wpisów(y) z listy SOP kana³u %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "Usuniêto %d wpisów(y) z listy VOP kana³u %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "Usuniêto 1 wpis z listy HOP kana³u %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "Usuniêto 1 wpis z listy SOP kana³u %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "Usuniêto 1 wpis z listy VOP kana³u %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Adres e-mail zosta³ usuniêty."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP kana³ {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Koniec listy u¿ytkowników."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a usuniêta."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Nie ma bota na kanale %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "      Powitanie: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Lista dostêpu dla %s jest pusta."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Lista dostêpu dla %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Wiadomo¶æ powitalna kana³u %s zosta³a zmieniona."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Komendy fantasy na kanale %s zosta³y wy³±czone."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Witanie u¿ytkowników na kanale %s zosta³o wy³±czone."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista HOP kana³u %s:\n"
-#~ "  Nr   Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "B³±d wewnêtrzny - nie mogê obs³u¿yæ ¿±dania."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Wiadomo¶æ powitalna #%d zosta³a skasowana."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nick %s nie jest zarejestrowany."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Rejestracja nicka %s"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Has³o do nicka %s"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Nie znaleziono znaku # na pocz±tku nazwy kana³u."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Opcja NOBOT zosta³a wy³±czona na kanale %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Nie znaleziono wpisów w li¶cie HOP kana³u %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Nie znaleziono wpisów w li¶cie SOP kana³u %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Nie znaleziono wpisów w li¶cie VOP kana³u %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Brak wpisu (#%d) na li¶cie AOP kana³u %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Brak wpisu (#%d) na li¶cie HOP kana³u %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Brak wpisu (#%d) na li¶cie SOP kana³u %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Brak wpisu (#%d) na li¶cie VOP kana³u %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Opcja OPNOTICE dla kana³u %s zosta³a wy³±czona."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Opcja PEACE dla kana³u %s zosta³a wy³±czona."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr "Odczekaj %d sekund(y) przed ponownym u¿yciem komendy SEND."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Opcja PRIVATE bota %s zosta³a wy³±czona."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Opcja PRIVATE dla kana³u %s zosta³a wy³±czona."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Opcja prywatno¶ci dla %s zosta³a wy³±czona."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Ochrona dla %s jest teraz wy³±czona."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Natychmiastowa ochrona jest teraz w³±czona."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER has³o [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Dostêp do kana³u %s nie jest ju¿ ograniczony."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista SOP kana³u %s:\n"
-#~ "  Nr   Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Kana³ %s nie jest zarejestrowany"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND kana³ [powód]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Status w³a¶ciciela kana³u %s nie bêdzie ju¿ chroniony."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Status operatora kana³u %s nie bêdzie ju¿ chroniony."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Opcja bezpieczeñstwa dla kana³u %s zosta³a wy³±czona."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Opcja bezpieczeñstwa dla %s zosta³a wy³±czona."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Serwisy nie mog± zmieniaæ trybów. Czy serwery s± dobrze skonfigurowane?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Serwisy dzia³aj± %d dzieñ, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Serwisy dzia³aj± %d godzinê i %d minutê."
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Serwisy dzia³aj± %d godzinê i %d minut(y)."
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Serwisy dzia³aj± %d godzin(y) i %d minutê."
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Serwisy dzia³aj± %d minutê i %d sekundê."
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Serwisy dzia³aj± %d minutê i %d sekund(y)."
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Serwisy dzia³aj± %d minut(y) i %d sekundê."
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Podpisywanie komendy KICK na kanale %s zosta³o wy³±czone."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Modyfikacja listy HOP jest tymczasowo wy³±czona."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Modyfikacja listy SOP jest tymczasowo wy³±czona."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Modyfikacja listy VOP jest tymczasowo wy³±czona."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Mo¿esz mieæ tylko %d wpisów na listach xOP."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Opcja SYMBIOSIS zosta³a wy³±czona na kanale %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "RANDOMNEWS ADD tekst"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR kana³ co"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "OPERNEWS ADD tekst"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Sk³adnia: SET DEBUG {ON | OFF | poziom}\n"
-#~ "\n"
-#~ "W³±cza lub wy³±cza tryb debugowania. W tym trybie wszystkie\n"
-#~ "dane wysy³ane do serwisów i przez nie oraz wiele innych\n"
-#~ "komunikatów zapisywane s± do loga. Je¶li zostanie podany \n"
-#~ "numer poziomu poziom tryb debugowania jest aktywowany\n"
-#~ "ze wskazanym poziomem.\n"
-#~ "\n"
-#~ "Ta opcja ma taki sam efekt jak argument linii poleceñ -debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Sk³adnia: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Wiadomo¶æ powitalna osoby %s zosta³a usuniêta."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "Ten modu³ nie mo¿e zostaæ wy³adowany."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Blokada tematu na kanale %s zosta³a wy³±czona."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Temat kana³u %s nie bêdzie ju¿ utrzymywany."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Nieznana komenda %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Nieznana opcja %s.\n"
-#~ "Napisz /msg %s HELP KICK, aby uzyskaæ wiêcej informacji."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "Nie znaleziono %s w bazie serwisu NickServ."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista VOP kana³u %s:\n"
-#~ "  Nr   Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Bot %s zosta³ usuniêty."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr ""
-#~ "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr ""
-#~ "[auto-memo] Wys³ana przez Ciebie wiadomo¶æ do %s zosta³a przeczytana."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Ostatnia wiadomo¶æ do %s zosta³a odwo³ana."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Twój vhost %s jest teraz aktywny."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Bot %s zosta³ usuniêty."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "System list xOP na kanale %s zosta³ wy³±czony."
diff --git a/language/anope.pot b/language/anope.pot
index 0f120c6c5..75744135a 100644
--- a/language/anope.pot
+++ b/language/anope.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,64 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr ""
-
-#: modules/core/ns_help.cpp:33
-msgid ""
-"%s allows you to \"register\" a nickname and\n"
-"prevent others from using it. The following\n"
-"commands allow for registration and maintenance of\n"
-"nicknames; to use them, type %s%s command.\n"
-"For more information on a specific command, type\n"
-"%s%s HELP command."
-msgstr ""
-
-#: modules/core/bs_help.cpp:35
-msgid ""
-"%s allows you to have a bot on your own channel.\n"
-"It has been created for users that can't host or\n"
-"configure a bot, or for use on networks that don't\n"
-"allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
-msgstr ""
-
-#: modules/core/cs_help.cpp:35
-msgid ""
-"%s allows you to register and control various\n"
-"aspects of channels. %s can often prevent\n"
-"malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges. Available\n"
-"commands are listed below; to use them, type\n"
-"%s%s command. For more information on a\n"
-"specific command, type %s%s HELP command."
-msgstr ""
-
-#: modules/core/ms_help.cpp:33
-#, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr ""
 
-#: modules/core/cs_access.cpp:238
+#: modules/core/cs_access.cpp:244
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:281
+#: modules/core/cs_akick.cpp:280
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr ""
@@ -108,61 +61,106 @@ msgstr ""
 msgid "%s added to your access list."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:54
+#: modules/core/ns_cert.cpp:55
+#, c-format
+msgid "%s added to your certificate list"
+msgstr ""
+
+#: modules/core/ns_cert.cpp:72
+#, c-format
+msgid "%s added to your certificate list."
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:55
 #, c-format
 msgid "%s added to your ignore list."
 msgstr ""
 
+#: modules/core/ns_help.cpp:34
+#, c-format
+msgid ""
+"%s allows you to \"register\" a nickname and\n"
+"prevent others from using it. The following\n"
+"commands allow for registration and maintenance of\n"
+"nicknames; to use them, type %s%s command.\n"
+"For more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+
+#: modules/core/bs_help.cpp:36
+#, c-format
+msgid ""
+"%s allows you to have a bot on your own channel.\n"
+"It has been created for users that can't host or\n"
+"configure a bot, or for use on networks that don't\n"
+"allow user bots. Available commands are listed \n"
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+
+#: modules/core/cs_help.cpp:36
+#, c-format
+msgid ""
+"%s allows you to register and control various\n"
+"aspects of channels. %s can often prevent\n"
+"malicious users from \"taking over\" channels by limiting\n"
+"who is allowed channel operator privileges. Available\n"
+"commands are listed below; to use them, type\n"
+"%s%s command. For more information on a\n"
+"specific command, type %s%s HELP command."
+msgstr ""
+
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr ""
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr ""
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr ""
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr ""
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr ""
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr ""
 
-#: modules/core/os_umode.cpp:47
+#: modules/core/os_mode.cpp:54
 #, c-format
-msgid "%s changed your usermodes."
+msgid "%s changed your usermodes to %s."
 msgstr ""
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -174,42 +172,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr ""
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr ""
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr ""
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr ""
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr ""
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr ""
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr ""
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr ""
@@ -219,67 +217,71 @@ msgstr ""
 msgid "%s deleted from your access list."
 msgstr ""
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
 #, c-format
-msgid "%s disabled on channel %s."
+msgid "%s deleted from your certificate list"
 msgstr ""
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/ns_cert.cpp:98
 #, c-format
-msgid "%s has been invited to %s."
+msgid "%s deleted from your certificate list."
 msgstr ""
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_access.cpp:611
 #, c-format
-msgid "%s has been unbanned from %s."
+msgid "%s disabled on channel %s."
 msgstr ""
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_invite.cpp:66
 #, c-format
-msgid "%s has too many channels registered."
+msgid "%s has been invited to %s."
 msgstr ""
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/cs_unban.cpp:56
 #, c-format
-msgid "%s is already covered by %s."
+msgid "%s has been unbanned from %s."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
-msgid "%s is already on your ignore list."
+msgid "%s has too many channels registered."
 msgstr ""
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/ms_help.cpp:34
 #, c-format
-msgid "%s is not a valid ban type."
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
 msgstr ""
 
-#: modules/core/bs_info.cpp:217
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
-msgid "%s is not a valid bot or registered channel."
+msgid "%s is already covered by %s."
 msgstr ""
 
-#: include/language.h:35
+#: modules/core/ms_ignore.cpp:58
 #, c-format
-msgid "%s is not a valid e-mail address."
+msgid "%s is already on your ignore list."
 msgstr ""
 
-#: include/language.h:23
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
-msgid "%s is not currently on channel %s."
+msgid "%s is not a valid ban type."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/bs_info.cpp:218
 #, c-format
-msgid "%s is not on your ignore list."
+msgid "%s is not a valid bot or registered channel."
 msgstr ""
 
-#: include/language.h:90
+#: modules/core/ms_ignore.cpp:70
 #, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
+msgid "%s is not on your ignore list."
 msgstr ""
 
 #: modules/core/cs_xop.cpp:189
@@ -292,12 +294,12 @@ msgstr ""
 msgid "%s not found on %s %s list."
 msgstr ""
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr ""
@@ -307,32 +309,32 @@ msgstr ""
 msgid "%s not found on %s bad words list."
 msgstr ""
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr ""
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr ""
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr ""
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr ""
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr ""
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr ""
@@ -342,12 +344,17 @@ msgstr ""
 msgid "%s not found on your access list."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, c-format
+msgid "%s not found on your certificate list."
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:67
 #, c-format
 msgid "%s removed from your ignore list."
 msgstr ""
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -369,26 +376,23 @@ msgstr ""
 msgid "%s will now permanently be ignored."
 msgstr ""
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr ""
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
 msgstr ""
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -420,19 +424,19 @@ msgstr ""
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr ""
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 msgid "password email"
 msgstr ""
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 msgid "password [email]"
 msgstr ""
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 msgid "target password"
 msgstr ""
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, c-format
 msgid ""
 " \n"
@@ -444,7 +448,7 @@ msgid ""
 "nickname(s)."
 msgstr ""
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -452,7 +456,8 @@ msgid ""
 "and level setting lists for any channel."
 msgstr ""
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -460,948 +465,343 @@ msgid ""
 "any nickname (%s%s ACCESS LIST nick)."
 msgstr ""
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr ""
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr ""
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr ""
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr ""
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, c-format
 msgid "      Fantasy reply : %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr ""
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, c-format
 msgid "     AMSG kicker    : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr ""
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr ""
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr ""
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr ""
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr ""
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr ""
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr ""
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-
-#: modules/core/ns_ajoin.cpp:110
-msgid "    AJOIN      Manage your auto join list"
-msgstr ""
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr ""
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr ""
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr ""
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr ""
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr ""
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr ""
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr ""
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr ""
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr ""
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr ""
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr ""
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr ""
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr ""
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr ""
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr ""
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr ""
-
-#: modules/core/cs_clearusers.cpp:70
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr ""
-
-#: modules/core/cs_clone.cpp:170
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr ""
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr ""
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr ""
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr ""
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr ""
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr ""
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr ""
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr ""
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr ""
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr ""
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr ""
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr ""
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr ""
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr ""
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr ""
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr ""
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr ""
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr ""
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr ""
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr ""
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr ""
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr ""
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr ""
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr ""
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr ""
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr ""
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr ""
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr ""
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr ""
-
-#: modules/core/ms_ignore.cpp:104
-msgid "    IGNORE Manage your memo ignore list"
-msgstr ""
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr ""
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr ""
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr ""
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr ""
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr ""
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr ""
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr ""
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr ""
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr ""
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr ""
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr ""
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr ""
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr ""
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr ""
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr ""
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr ""
-
-#: modules/core/cs_mode.cpp:312
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr ""
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr ""
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr ""
-
-#: modules/core/os_modreload.cpp:96
-msgid "    MODRELOAD   Reload a module"
-msgstr ""
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr ""
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr ""
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr ""
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr ""
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr ""
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr ""
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr ""
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr ""
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr ""
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr ""
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr ""
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr ""
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr ""
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr ""
-
-#: modules/core/ns_set_private.cpp:67
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr ""
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr ""
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr ""
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr ""
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr ""
-
-#: modules/core/cs_register.cpp:131
-msgid "    REGISTER   Register a channel"
-msgstr ""
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr ""
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr ""
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr ""
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr ""
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr ""
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr ""
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr ""
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr ""
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr ""
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr ""
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr ""
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr ""
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr ""
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr ""
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr ""
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr ""
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr ""
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr ""
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr ""
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr ""
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr ""
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr ""
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr ""
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr ""
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr ""
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr ""
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr ""
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr ""
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr ""
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr ""
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr ""
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr ""
-
-#: modules/core/cs_status.cpp:59
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr ""
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr ""
-
-#: modules/core/cs_suspend.cpp:96
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr ""
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr ""
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr ""
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr ""
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr ""
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr ""
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr ""
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr ""
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr ""
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr ""
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr ""
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr ""
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr ""
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr ""
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr ""
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr ""
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr ""
@@ -1411,18 +811,6 @@ msgstr ""
 msgid "  %3d   %-30s %s"
 msgstr ""
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr ""
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1433,24 +821,17 @@ msgstr ""
 msgid "  %3d  %4d  %s"
 msgstr ""
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr ""
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr ""
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr ""
@@ -1460,92 +841,80 @@ msgstr ""
 msgid "  %3d %s (%s)"
 msgstr ""
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr ""
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr ""
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr ""
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr ""
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr ""
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+msgid "\"Jupiter\" a server"
+msgstr ""
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr ""
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr ""
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr ""
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr ""
 
-#: include/language.h:91
-#, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr ""
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-
 #: modules/core/os_session.cpp:117
 #, c-format
 msgid ""
@@ -1560,17 +929,12 @@ msgid ""
 "    %s"
 msgstr ""
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr ""
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr ""
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, c-format
 msgid "%c is not locked on %s."
 msgstr ""
@@ -1580,32 +944,32 @@ msgstr ""
 msgid "%c%3d  %-16s  %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr ""
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr ""
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr ""
@@ -1616,14 +980,14 @@ msgstr ""
 msgid "%s %s list is empty."
 msgstr ""
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr ""
@@ -1633,7 +997,7 @@ msgstr ""
 msgid "%s bad words list is empty."
 msgstr ""
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr ""
@@ -1643,47 +1007,47 @@ msgstr ""
 msgid "%s cannot receive memos."
 msgstr ""
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, c-format
 msgid "%s commands"
 msgstr ""
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
+msgid "%s commands:"
 msgstr ""
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr ""
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr ""
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr ""
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr ""
@@ -1693,47 +1057,27 @@ msgstr ""
 msgid "%s currently has too many memos and cannot receive more."
 msgstr ""
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr ""
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr ""
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr ""
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr ""
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr ""
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr ""
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr ""
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr ""
@@ -1755,22 +1099,22 @@ msgstr ""
 msgid "%s is no longer a Super-Admin"
 msgstr ""
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr ""
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr ""
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr ""
@@ -1787,6 +1131,11 @@ msgid ""
 "  Num  Nick"
 msgstr ""
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, c-format
 msgid "%s was not found on your auto join list."
@@ -1824,63 +1173,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr ""
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr ""
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr ""
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr ""
 
-#: include/language.h:37
-msgid "<unknown>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
 msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr ""
 
@@ -1891,34 +1243,26 @@ msgid ""
 "read his/her memo."
 msgstr ""
 
-#: modules/core/ns_register.cpp:287
+#: modules/core/ns_register.cpp:202
+#, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
-msgstr ""
-
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
+"confirm your email address."
 msgstr ""
 
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr ""
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr ""
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr ""
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr ""
 
@@ -1928,59 +1272,54 @@ msgid ""
 "[reason]"
 msgstr ""
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr ""
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+msgid "AKILL all users on a specific channel"
+msgstr ""
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr ""
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
 "list} [reason]]"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr ""
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr ""
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr ""
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr ""
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr ""
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr ""
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr ""
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr ""
@@ -1995,24 +1334,26 @@ msgstr ""
 msgid "Access list for %s:"
 msgstr ""
 
-#: include/language.h:81
-#, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr ""
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 msgstr ""
 
+#: modules/core/cs_set_secure.cpp:21
+#, c-format
+msgid "Activate %s's security features"
+msgstr ""
+
+#: modules/core/hs_on.cpp:21
+msgid "Activates your assigned vhost"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:46
 #, c-format
 msgid "Added %s to your auto join list."
@@ -2033,7 +1374,7 @@ msgstr ""
 msgid "Added new random news item (#%d)."
 msgstr ""
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2044,22 +1385,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr ""
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr ""
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr ""
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr ""
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr ""
@@ -2068,12 +1409,12 @@ msgstr ""
 msgid "All logon news items deleted."
 msgstr ""
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr ""
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr ""
 
@@ -2085,22 +1426,22 @@ msgstr ""
 msgid "All random news items deleted."
 msgstr ""
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr ""
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, c-format
 msgid "All users have been kicked from %s."
 msgstr ""
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr ""
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr ""
@@ -2221,12 +1562,28 @@ msgstr ""
 msgid "Allowed to view the access list"
 msgstr ""
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+
+#: modules/core/bs_assign.cpp:21
+msgid "Assigns a bot to a channel"
+msgstr ""
+
+#: modules/core/ns_set_greet.cpp:21
+msgid "Associate a greet message with your nickname"
+msgstr ""
+
+#: modules/core/ns_set_email.cpp:49
+msgid "Associate an E-mail address with your nickname"
+msgstr ""
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr ""
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr ""
@@ -2251,16 +1608,16 @@ msgstr ""
 msgid "Automatic mode +v"
 msgstr ""
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr ""
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2274,26 +1631,25 @@ msgid ""
 "  Num   Word                           Type"
 msgstr ""
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr ""
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr ""
 
-#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
-#, c-format
-msgid "Bot %s already exists."
+#: modules/core/cs_ban.cpp:21
+msgid "Bans a selected nick on a channel"
 msgstr ""
 
-#: include/language.h:103
+#: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
-msgid "Bot %s does not exist."
+msgid "Bot %s already exists."
 msgstr ""
 
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr ""
@@ -2308,27 +1664,27 @@ msgstr ""
 msgid "Bot %s has been deleted."
 msgstr ""
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr ""
@@ -2358,16 +1714,11 @@ msgstr ""
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr ""
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr ""
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr ""
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2376,7 +1727,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2384,24 +1735,24 @@ msgid ""
 "to add or remove a bad word."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
 "%d kicks to the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2409,48 +1760,48 @@ msgid ""
 "place a ban after %d kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
 "%d characters and %d%% of the entire message)."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
 "will place a ban after %d kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
 "%d kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2458,217 +1809,237 @@ msgid ""
 "kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
 "the same thing)."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 msgid "Bot will now kick for amsgs"
 msgstr ""
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
 "kicks for the same user."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 msgid "Bot won't kick for amsgs anymore."
 msgstr ""
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr ""
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr ""
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr ""
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr ""
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr ""
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr ""
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 msgid "CLEARUSERS channel"
 msgstr ""
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 msgid "CLONE channel target"
 msgstr ""
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+msgid "Cancel last memo you sent"
+msgstr ""
+
+#: modules/core/cs_drop.cpp:23
+msgid "Cancel the registration of a channel"
+msgstr ""
+
+#: modules/core/ns_drop.cpp:22
+msgid "Cancel the registration of a nickname"
+msgstr ""
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+msgid "Cert list:"
+msgstr ""
+
+#: modules/core/ns_cert.cpp:23
 #, c-format
-msgid "ChanServ      : %6d records, %5d kB"
+msgid "Certificate list for %s is empty."
 msgstr ""
 
-#: modules/core/os_umode.cpp:46
+#: modules/core/ns_cert.cpp:33
 #, c-format
-msgid "Changed usermodes of %s."
+msgid "Certificate list for %s:"
 msgstr ""
 
-#: include/language.h:29
+#: modules/core/os_stats.cpp:173
 #, c-format
-msgid "Channel %s doesn't exist."
+msgid "ChanServ      : %6d records, %5d kB"
+msgstr ""
+
+#: modules/core/os_mode.cpp:21
+msgid "Change channel or user modes"
+msgstr ""
+
+#: modules/core/ns_set_message.cpp:21
+msgid "Change the communication method of Services"
 msgstr ""
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/os_mode.cpp:52
 #, c-format
-msgid "Channel %s has been dropped."
+msgid "Changed usermodes of %s to %s."
 msgstr ""
 
-#: include/language.h:31
+#: modules/core/cs_drop.cpp:75
 #, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
+msgid "Channel %s has been dropped."
 msgstr ""
 
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr ""
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr ""
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr ""
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr ""
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr ""
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr ""
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr ""
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr ""
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr ""
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr ""
@@ -2678,100 +2049,119 @@ msgstr ""
 msgid "Channel %s %s list has been cleared."
 msgstr ""
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, c-format
 msgid "Channel %s has no mode locks."
 msgstr ""
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr ""
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
 msgstr ""
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description"
 msgstr ""
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+msgid "Checks if last memo to a nick was read"
+msgstr ""
+
+#: modules/core/bs_set.cpp:22
+msgid "Configures bot options"
+msgstr ""
+
+#: modules/core/bs_kick.cpp:22
+msgid "Configures kickers"
+msgstr ""
+
+#: modules/core/ns_register.cpp:24
+msgid "Confirm an auth code"
+msgstr ""
+
+#: modules/core/cs_mode.cpp:305
+msgid "Control modes and mode locks on a channel"
+msgstr ""
+
+#: modules/core/cs_clone.cpp:21
+msgid "Copy all settings from one channel to another"
+msgstr ""
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr ""
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr ""
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr ""
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr ""
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr ""
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr ""
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
 msgstr ""
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr ""
 
@@ -2795,51 +2185,55 @@ msgstr ""
 msgid "Current number of SZLINEs: %d"
 msgstr ""
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 msgid "DEHALFOP [#channel] [nick]"
 msgstr ""
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr ""
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr ""
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 msgid "DEOP [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 msgid "DEOWNER [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 msgid "DEROTECT [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 msgid "DEVOICE [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr ""
 
+#: modules/core/hs_off.cpp:21
+msgid "Deactivates your assigned vhost"
+msgstr ""
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -2964,6 +2358,34 @@ msgstr ""
 msgid "Default SZLINE expiry time: No expiration"
 msgstr ""
 
+#: modules/core/os_news.cpp:369
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+
+#: modules/core/os_news.cpp:297
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+
+#: modules/core/os_news.cpp:333
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:268
+msgid "Dehalfops a selected nick on a channel"
+msgstr ""
+
+#: modules/core/ms_del.cpp:46
+msgid "Delete a memo or memos"
+msgstr ""
+
+#: modules/core/hs_delall.cpp:21
+msgid "Delete the vhost for all nicks in a group"
+msgstr ""
+
+#: modules/core/hs_del.cpp:21
+msgid "Delete the vhost of another user"
+msgstr ""
+
 #: modules/core/cs_xop.cpp:85
 #, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -2974,7 +2396,7 @@ msgstr ""
 msgid "Deleted %d entries from %s access list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr ""
@@ -3014,7 +2436,7 @@ msgstr ""
 msgid "Deleted 1 entry from %s access list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr ""
@@ -3049,31 +2471,65 @@ msgstr ""
 msgid "Deleted one entry from %s %s list."
 msgstr ""
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+msgid "Deops a selected nick on a channel"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:343
+msgid "Deprotects a selected nick on a channel"
+msgstr ""
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr ""
 
-#: include/language.h:109
-msgid "Disabled"
+#: modules/core/cs_modes.cpp:196
+msgid "Devoices a selected nick on a channel"
 msgstr ""
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/ns_ghost.cpp:22
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr ""
+
+#: modules/core/os_staff.cpp:21
+msgid "Display Services staff and online status"
+msgstr ""
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr ""
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr ""
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr ""
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+msgid "Displays information about a given nickname"
+msgstr ""
+
+#: modules/core/ms_info.cpp:21
+msgid "Displays information about your memos"
+msgstr ""
+
+#: modules/core/hs_list.cpp:21
+msgid "Displays one or more vhost entries."
+msgstr ""
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+msgid "Displays this list and give information about commands"
+msgstr ""
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3102,166 +2558,203 @@ msgstr ""
 msgid "Don't use underlines on this channel!"
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr ""
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr ""
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr ""
 
-#: modules/core/ns_getemail.cpp:42
-#, c-format
-msgid "Emails Match %s to %s."
-msgstr ""
-
-#: include/language.h:108
-msgid "Enabled"
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
 msgstr ""
 
-#: include/language.h:39
+#: modules/core/ns_getemail.cpp:43
 #, c-format
-msgid "End of %s list."
+msgid "Emails Match %s to %s."
 msgstr ""
 
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr ""
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr ""
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr ""
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr ""
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr ""
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+msgid "Error reloading confguration file: "
+msgstr ""
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr ""
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr ""
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr ""
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr ""
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr ""
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr ""
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr ""
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr ""
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr ""
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
+#, c-format
+msgid "Fantasy mode is now off on channel %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:104
 #, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now on on channel %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr ""
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr ""
+
+#: modules/core/os_update.cpp:21
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+
+#: modules/core/os_svsnick.cpp:21
+msgid "Forcefully change a user's nickname"
+msgstr ""
+
+#: modules/core/cs_saset.cpp:24
+msgid "Forcefully set channel options and information"
+msgstr ""
+
+#: modules/core/ns_sendpass.cpp:24
+msgid "Forgot your password? Try this"
+msgstr ""
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr ""
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr ""
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr ""
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr ""
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr ""
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr ""
 
@@ -3269,11 +2762,23 @@ msgstr ""
 msgid "GLOBAL message"
 msgstr ""
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr ""
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+msgid "Give Operflags to a certain user"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:93
+msgid "Gives Op status to a selected nick on a channel"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:379
+msgid "Gives you owner status on channel"
+msgstr ""
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr ""
 
@@ -3281,75 +2786,132 @@ msgstr ""
 msgid "Greet message displayed"
 msgstr ""
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr ""
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr ""
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr ""
+
+#: modules/core/cs_modes.cpp:259
 msgid "HALFOP [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+msgid "Halfops a selected nick on a channel"
+msgstr ""
+
+#: modules/core/ns_resetpass.cpp:24
+msgid "Helps you reset lost passwords"
+msgstr ""
+
+#: modules/core/ns_set_email.cpp:32
+#, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+
+#: modules/core/ns_register.cpp:354
+#, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+
+#: modules/core/ns_set_hide.cpp:21
+msgid "Hide certain pieces of nickname information"
+msgstr ""
+
+#: modules/core/cs_set_private.cpp:21
+msgid "Hide channel from LIST command"
+msgstr ""
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr ""
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr ""
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr ""
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr ""
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr ""
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr ""
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr ""
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+msgid "Identify yourself with your password"
+msgstr ""
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr ""
@@ -3358,11 +2920,12 @@ msgstr ""
 msgid "Ignore list is empty."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 msgid "Ignore list:"
 msgstr ""
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3372,43 +2935,33 @@ msgid ""
 "on a specific option."
 msgstr ""
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+msgid "Info about a loaded module"
 msgstr ""
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr ""
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr ""
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr ""
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
 "zero and less than %d."
 msgstr ""
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 
@@ -3416,12 +2969,16 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr ""
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+msgid "Join a group"
+msgstr ""
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr ""
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 msgid "KICK channel option {ON|} [settings]"
 msgstr ""
 
@@ -3429,259 +2986,399 @@ msgstr ""
 msgid "KICK channel user reason"
 msgstr ""
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr ""
 
-#: modules/core/cs_access.cpp:741
-msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
+#: modules/core/os_kick.cpp:21
+msgid "Kick a user from a channel"
 msgstr ""
 
-#: include/language.h:62
-msgid "LIST pattern"
+#: modules/core/cs_kick.cpp:21
+msgid "Kicks a selected nick from a channel"
 msgstr ""
 
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_recover.cpp:22
+msgid "Kill another user who has taken your nick"
+msgstr ""
+
+#: modules/core/cs_access.cpp:755
+msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
+msgstr ""
+
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr ""
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr ""
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+msgid "LOGIN password"
+msgstr ""
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr ""
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr ""
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr ""
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr ""
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr ""
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr ""
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr ""
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr ""
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
+#: modules/core/ns_list.cpp:22
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+
+#: modules/core/ns_alist.cpp:21
+msgid "List channels you have access on"
+msgstr ""
+
+#: modules/core/os_modlist.cpp:21
+msgid "List loaded modules"
 msgstr ""
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr ""
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr ""
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+msgid "List your memos"
+msgstr ""
+
+#: modules/core/os_chanlist.cpp:21
+msgid "Lists all channel records"
+msgstr ""
+
+#: modules/core/ns_group.cpp:252
+msgid "Lists all nicknames in your group"
+msgstr ""
+
+#: modules/core/cs_list.cpp:23
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+
+#: modules/core/os_userlist.cpp:21
+msgid "Lists all user records"
+msgstr ""
+
+#: modules/core/bs_botlist.cpp:21
+msgid "Lists available bots"
+msgstr ""
+
+#: modules/core/cs_info.cpp:35
+msgid "Lists information about the named registered channel"
+msgstr ""
+
+#: modules/core/os_modload.cpp:21
+msgid "Load a module"
+msgstr ""
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr ""
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
 msgstr ""
 
-#: modules/core/os_news.cpp:37
-msgid "Logon news items:"
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
 msgstr ""
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/os_news.cpp:42
+#, c-format
+msgid "Logon news item #%s not found!"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_news.cpp:37
+msgid "Logon news items:"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:307
+#: modules/core/cs_mode.cpp:355
 msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_mode.cpp:75
+msgid "MODE {channel|user} modes"
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr ""
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr ""
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 msgid "MODRELOAD FileName"
 msgstr ""
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr ""
 
+#: modules/core/cs_akick.cpp:477
+msgid "Maintain the AutoKick list"
+msgstr ""
+
+#: modules/core/bs_badwords.cpp:231
+msgid "Maintains bad words list"
+msgstr ""
+
+#: modules/core/bs_bot.cpp:307
+msgid "Maintains network bot list"
+msgstr ""
+
+#: modules/core/cs_xop.cpp:530
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr ""
+
+#: modules/core/cs_xop.cpp:652
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr ""
+
+#: modules/core/bs_act.cpp:21
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+
+#: modules/core/bs_say.cpp:21
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+
+#: modules/core/ns_ajoin.cpp:76
+msgid "Manage your auto join list"
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:21
+msgid "Manage your memo ignore list"
+msgstr ""
+
+#: modules/core/os_akill.cpp:352
+msgid "Manipulate the AKILL list"
+msgstr ""
+
+#: modules/core/os_defcon.cpp:60
+msgid "Manipulate the DefCon system"
+msgstr ""
+
+#: modules/core/os_snline.cpp:366
+msgid "Manipulate the SNLINE list"
+msgstr ""
+
+#: modules/core/os_sqline.cpp:346
+msgid "Manipulate the SQLINE list"
+msgstr ""
+
+#: modules/core/os_szline.cpp:348
+msgid "Manipulate the SZLINE list"
+msgstr ""
+
+#: modules/core/cs_topic.cpp:21
+msgid "Manipulate the topic of the specified channel"
+msgstr ""
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr ""
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
+#: modules/core/ns_getemail.cpp:25
+msgid "Matches and returns all users that registered using given email"
 msgstr ""
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr ""
 
 #: modules/core/ms_read.cpp:39
+#, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr ""
 
 #: modules/core/ms_read.cpp:37
+#, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr ""
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr ""
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr ""
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr ""
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr ""
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr ""
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr ""
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr ""
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
-msgstr ""
-
-#: modules/core/ms_list.cpp:134
-msgid "Memos for %s. To read, type: %s%s READ num"
+#, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr ""
 
-#: modules/core/ms_list.cpp:132
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr ""
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, c-format
 msgid "Mode locks for %s:"
 msgstr ""
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+msgid "Modify the Services ignore list"
+msgstr ""
+
+#: modules/core/cs_xop.cpp:468
+msgid "Modify the list of AOP users"
+msgstr ""
+
+#: modules/core/cs_xop.cpp:406
+msgid "Modify the list of QOP users"
+msgstr ""
+
+#: modules/core/cs_xop.cpp:590
+msgid "Modify the list of SOP users"
+msgstr ""
+
+#: modules/core/ns_access.cpp:120
+msgid "Modify the list of authorized addresses"
+msgstr ""
+
+#: modules/core/cs_access.cpp:396
+msgid "Modify the list of privileged users"
+msgstr ""
+
+#: modules/core/os_session.cpp:437
+msgid "Modify the session-limit exception list"
+msgstr ""
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr ""
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr ""
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr ""
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, c-format
 msgid "Module %s reloaded"
 msgstr ""
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr ""
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr ""
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr ""
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr ""
@@ -3694,11 +3391,13 @@ msgstr ""
 msgid "New memo"
 msgstr ""
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr ""
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr ""
 
@@ -3706,139 +3405,107 @@ msgstr ""
 msgid "News list is full!"
 msgstr ""
 
-#: include/language.h:25
+#: modules/core/ns_register.cpp:42
 #, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
+msgid "Nick %s has been confirmed."
+msgstr ""
+
+#: modules/core/ns_register.cpp:38
+#, c-format
+msgid "Nick %s is already confirmed."
 msgstr ""
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr ""
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr ""
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr ""
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr ""
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr ""
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr ""
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr ""
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr ""
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr ""
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr ""
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr ""
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr ""
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr ""
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr ""
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr ""
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr ""
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr ""
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr ""
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr ""
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr ""
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr ""
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr ""
-
-#: include/language.h:50
+#: modules/core/ns_register.cpp:189
 #, c-format
-msgid "Nickname %s may not be registered."
+msgid "Nickname %s registered under your account: %s"
 msgstr ""
 
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:191
 #, c-format
-msgid "Nickname %s registered under your account: %s"
+msgid "Nickname %s registered."
 msgstr ""
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:353
 #, c-format
-msgid "Nickname %s registered."
+msgid "Nickname Registration (%s)"
 msgstr ""
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -3846,26 +3513,35 @@ msgid ""
 "after %d days if not used."
 msgstr ""
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
 #, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now off on channel %s."
 msgstr ""
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/bs_set.cpp:136
+#, c-format
+msgid "No Bot mode is now on on channel %s."
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr ""
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr ""
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+msgid "No expire"
+msgstr ""
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr ""
@@ -3880,13 +3556,13 @@ msgid "No matching entries on %s %s list."
 msgstr ""
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr ""
@@ -3897,39 +3573,43 @@ msgstr ""
 msgid "No matching entries on %s bad words list."
 msgstr ""
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr ""
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr ""
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr ""
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr ""
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr ""
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr ""
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr ""
@@ -3938,16 +3618,12 @@ msgstr ""
 msgid "No random news items to delete!"
 msgstr ""
 
-#: include/language.h:36
-msgid "No reason"
-msgstr ""
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr ""
 
@@ -3955,7 +3631,7 @@ msgstr ""
 msgid "Not allowed to join channel"
 msgstr ""
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -3963,27 +3639,27 @@ msgid ""
 "for that period of time) will be automatically dropped."
 msgstr ""
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr ""
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr ""
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 msgid "OP [#channel] [nick]"
 msgstr ""
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 msgid "OWNER [#channel] [nick]"
 msgstr ""
 
@@ -3991,13 +3667,18 @@ msgstr ""
 msgid "Old info is equal to the new one."
 msgstr ""
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr ""
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, c-format
+msgid "Op-notice option for %s is now on."
 msgstr ""
 
 #: modules/core/os_news.cpp:55
@@ -4007,123 +3688,92 @@ msgstr ""
 
 #: modules/core/os_news.cpp:54
 #, c-format
-msgid "Oper news item #%d not found!"
+msgid "Oper news item #%s not found!"
 msgstr ""
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr ""
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr ""
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 msgid "PROTECT [#channel] [nick]"
 msgstr ""
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr ""
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr ""
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr ""
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
+#: modules/core/os_login.cpp:46
+msgid "Password accepted."
 msgstr ""
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr ""
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr ""
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr ""
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr ""
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr ""
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, c-format
-msgid "Peace option for %s is now ."
-msgstr ""
-
-#: modules/core/cs_info.cpp:97
-msgid "Persistant"
+msgid "Peace option for %s is now off."
 msgstr ""
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
+#: modules/core/cs_set_peace.cpp:33
+#, c-format
+msgid "Peace option for %s is now on."
 msgstr ""
 
-#: include/language.h:18
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
+#: modules/core/cs_info.cpp:98
+msgid "Persistant"
 msgstr ""
 
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr ""
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr ""
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr ""
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4138,62 +3788,111 @@ msgstr ""
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+msgid "Prevent a channel from being used"
+msgstr ""
+
+#: modules/core/cs_suspend.cpp:21
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+
+#: modules/core/cs_saset_noexpire.cpp:21
+msgid "Prevent the channel from expiring"
+msgstr ""
+
+#: modules/core/ns_set_private.cpp:21
+#, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+
+#: modules/core/ns_saset_noexpire.cpp:21
+msgid "Prevent the nickname from expiring"
+msgstr ""
+
+#: modules/core/ns_forbid.cpp:21
+msgid "Prevents a nickname from being registered"
+msgstr ""
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr ""
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, c-format
+msgid "Private mode of bot %s is now off."
+msgstr ""
+
+#: modules/core/bs_set.cpp:49
+#, c-format
+msgid "Private mode of bot %s is now on."
+msgstr ""
+
+#: modules/core/cs_set_private.cpp:38
+#, c-format
+msgid "Private option for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_private.cpp:33
 #, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private option for %s is now on."
 msgstr ""
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/ns_set_private.cpp:41
 #, c-format
-msgid "Private option for %s is now ."
+msgid "Private option is now off for %s."
 msgstr ""
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:36
 #, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now on for %s."
 msgstr ""
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:46
 #, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:55
 #, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s, with no delay."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:39
+#, c-format
+msgid "Protection is now on for %s."
+msgstr ""
+
+#: modules/core/cs_modes.cpp:306
+msgid "Protects a selected nick on a channel"
 msgstr ""
 
 #: modules/core/os_modinfo.cpp:32
 msgid "Providing command: %%s %s"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr ""
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr ""
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr ""
 
@@ -4201,15 +3900,15 @@ msgstr ""
 msgid "REGISTER channel description"
 msgstr ""
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr ""
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr ""
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr ""
 
@@ -4220,276 +3919,330 @@ msgstr ""
 
 #: modules/core/os_news.cpp:66
 #, c-format
-msgid "Random news item #%d not found!"
+msgid "Random news item #%s not found!"
 msgstr ""
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr ""
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+msgid "Read a memo or memos"
 msgstr ""
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
+#: modules/core/cs_access.cpp:672
+msgid "Redefine the meanings of access levels"
+msgstr ""
+
+#: modules/core/ns_release.cpp:22
+msgid "Regain custody of your nick after RECOVER"
+msgstr ""
+
+#: modules/core/cs_register.cpp:22
+msgid "Register a channel"
+msgstr ""
+
+#: modules/core/ns_register.cpp:95
+msgid "Register a nickname"
+msgstr ""
+
+#: modules/core/cs_set_peace.cpp:21
+msgid "Regulate the use of critical commands"
+msgstr ""
+
+#: modules/core/cs_suspend.cpp:99
+msgid "Releases a suspended channel"
+msgstr ""
+
+#: modules/core/os_modreload.cpp:21
+msgid "Reload a module"
+msgstr ""
+
+#: modules/core/os_reload.cpp:21
+msgid "Reload services' configuration file"
 msgstr ""
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/ns_group.cpp:187
+msgid "Remove a nick from a group"
+msgstr ""
+
+#: modules/core/cs_unban.cpp:21
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:415
+msgid "Removes your owner status on a channel"
+msgstr ""
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+msgid "Restrict access to the channel"
+msgstr ""
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr ""
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:94
-msgid "SASAET nickname PRIVATE {ON | OFF}"
+#: modules/core/cs_set_restricted.cpp:34
+#, c-format
+msgid "Restricted access option for %s is now on."
+msgstr ""
+
+#: modules/core/cs_set_keeptopic.cpp:21
+msgid "Retain topic when channel is not in use"
+msgstr ""
+
+#: modules/core/ns_getpass.cpp:21
+msgid "Retrieve the password for a nickname"
+msgstr ""
+
+#: modules/core/cs_status.cpp:21
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+
+#: modules/core/cs_getkey.cpp:21
+msgid "Returns the key of the given channel"
+msgstr ""
+
+#: modules/core/ns_status.cpp:22
+msgid "Returns the owner status of the given nickname"
+msgstr ""
+
+#: modules/core/ns_logout.cpp:21
+msgid "Reverses the effect of the IDENTIFY command"
 msgstr ""
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
+#: modules/core/ns_set_message.cpp:90
+msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr ""
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr ""
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr ""
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr ""
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr ""
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr ""
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 msgid "SENDALL memo-text"
 msgstr ""
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr ""
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr ""
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr ""
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr ""
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr ""
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 msgid "SET botname NOBOT {ON|}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 msgid "SET botname PRIVATE {ON|}"
 msgstr ""
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr ""
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 msgid "SET channel FANTASY {ON|}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 msgid "SET channel GREET {ON|}"
 msgstr ""
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr ""
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr ""
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr ""
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr ""
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr ""
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr ""
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr ""
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 msgid "SET LANGUAGE language"
 msgstr ""
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr ""
 
@@ -4497,7 +4250,7 @@ msgstr ""
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr ""
 
@@ -4505,154 +4258,209 @@ msgstr ""
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr ""
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr ""
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr ""
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr ""
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr ""
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr ""
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
 "list} [reason]]"
 msgstr ""
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr ""
+
+#: modules/core/ns_cert.cpp:203
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr ""
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr ""
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr ""
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr ""
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr ""
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel freason"
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr ""
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr ""
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr ""
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr ""
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
 "list} [reason]]"
 msgstr ""
 
-#: modules/core/cs_info.cpp:88
-msgid "Secure"
+#: modules/core/os_restart.cpp:21
+msgid "Save databases and restart Services"
 msgstr ""
 
 #: modules/core/cs_info.cpp:89
-msgid "Secure Founder"
+msgid "Secure"
 msgstr ""
 
 #: modules/core/cs_info.cpp:90
+msgid "Secure Founder"
+msgstr ""
+
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr ""
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, c-format
+msgid "Secure founder option for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr ""
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr ""
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
 msgstr ""
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:38
 #, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option for %s is now off."
 msgstr ""
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/cs_set_secure.cpp:33
+#, c-format
+msgid "Secure option for %s is now on."
+msgstr ""
+
+#: modules/core/ns_set_secure.cpp:41
+#, c-format
+msgid "Secure option is now off for %s."
+msgstr ""
+
+#: modules/core/ns_set_secure.cpp:36
+#, c-format
+msgid "Secure option is now on for %s."
+msgstr ""
+
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr ""
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+msgid "Send a memo to a nick or channel"
+msgstr ""
+
+#: modules/core/ms_staff.cpp:21
+msgid "Send a memo to all opers/admins"
+msgstr ""
+
+#: modules/core/ms_sendall.cpp:21
+msgid "Send a memo to all registered users"
+msgstr ""
+
+#: modules/core/os_global.cpp:21
+msgid "Send a message to all users"
+msgstr ""
+
+#: modules/core/cs_set_opnotice.cpp:21
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+
+#: modules/core/ms_rsend.cpp:21
+msgid "Sends a memo and requests a read receipt"
+msgstr ""
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr ""
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr ""
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr ""
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr ""
 
@@ -4664,7 +4472,7 @@ msgstr ""
 msgid "Services are now in read-write mode."
 msgstr ""
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr ""
@@ -4677,7 +4485,7 @@ msgstr ""
 msgid "Services are now in non-debug mode."
 msgstr ""
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr ""
 
@@ -4687,176 +4495,200 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
 "correctly?"
 msgstr ""
 
-#: modules/core/os_stats.cpp:137
+#: modules/core/os_stats.cpp:135
 #, c-format
-msgid "Services up %d days, %02d:%02d"
+msgid "Services up %s"
 msgstr ""
 
-#: modules/core/os_stats.cpp:145
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
-msgid "Services up %d hours, %d minutes"
+msgid "Services will no longer autoop %s in channels."
 msgstr ""
 
-#: modules/core/os_stats.cpp:161
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
-msgid "Services up %d minutes, %d seconds"
+msgid "Services will now autoop %s in channels."
 msgstr ""
 
-#: modules/core/os_stats.cpp:139
+#: modules/core/ns_set_message.cpp:42
 #, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
+msgid "Services will now reply to %s with messages."
 msgstr ""
 
-#: modules/core/os_stats.cpp:152
+#: modules/core/ns_set_message.cpp:47
 #, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
+msgid "Services will now reply to %s with notices."
 msgstr ""
 
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
+#: modules/core/os_reload.cpp:32
+msgid "Services' configuration file has been reloaded."
 msgstr ""
 
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
+msgid "Services' hold on your nick has been released."
 msgstr ""
 
-#: modules/core/os_stats.cpp:170
+#: modules/core/os_session.cpp:287
 #, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
+msgid "Session limit for %s set to %d."
 msgstr ""
 
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
+msgid "Session limiting is disabled."
 msgstr ""
 
-#: modules/core/os_stats.cpp:163
+#: modules/core/os_stats.cpp:187
 #, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
+msgid "Sessions      : %6d records, %5d kB"
 msgstr ""
 
-#: modules/core/ns_set_autoop.cpp:40
-#, c-format
-msgid "Services will no longer autoop %s in channels."
+#: modules/core/os_session.cpp:140
+msgid "Sessions  Host"
 msgstr ""
 
-#: modules/core/ns_set_autoop.cpp:35
-#, c-format
-msgid "Services will now autoop %s in channels."
+#: modules/core/ns_saset.cpp:24
+msgid "Set SET-options on another nickname"
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:41
-#, c-format
-msgid "Services will now reply to %s with messages."
+#: modules/core/cs_set.cpp:24
+msgid "Set channel options and information"
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:46
-#, c-format
-msgid "Services will now reply to %s with notices."
+#: modules/core/cs_set_bantype.cpp:21
+msgid "Set how Services make bans on the channel"
 msgstr ""
 
-#: modules/core/os_reload.cpp:37
-msgid "Services' configuration file has been reloaded."
+#: modules/core/ms_set.cpp:204
+msgid "Set options related to memos"
 msgstr ""
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
-msgid "Services' hold on your nick has been released."
+#: modules/core/ns_set.cpp:24
+msgid "Set options, including kill protection"
 msgstr ""
 
-#: modules/core/os_session.cpp:281
-#, c-format
-msgid "Session limit for %s set to %d."
+#: modules/core/cs_set_persist.cpp:21
+msgid "Set the channel as permanent"
 msgstr ""
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
-msgid "Session limiting is disabled."
+#: modules/core/cs_set_description.cpp:21
+msgid "Set the channel description"
 msgstr ""
 
-#: modules/core/os_stats.cpp:225
-#, c-format
-msgid "Sessions      : %6d records, %5d kB"
+#: modules/core/ns_saset.cpp:132
+msgid "Set the display of the group in Services"
 msgstr ""
 
-#: modules/core/os_session.cpp:135
-msgid "Sessions  Host"
+#: modules/core/ns_set.cpp:129
+msgid "Set the display of your group in Services"
+msgstr ""
+
+#: modules/core/cs_set_founder.cpp:21
+msgid "Set the founder of a channel"
+msgstr ""
+
+#: modules/core/ns_set_language.cpp:21
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+
+#: modules/core/ns_saset.cpp:175
+msgid "Set the nickname password"
+msgstr ""
+
+#: modules/core/cs_set_successor.cpp:21
+msgid "Set the successor for a channel"
+msgstr ""
+
+#: modules/core/hs_setall.cpp:21
+msgid "Set the vhost for all nicks in a group"
+msgstr ""
+
+#: modules/core/hs_set.cpp:21
+msgid "Set the vhost of another user"
+msgstr ""
+
+#: modules/core/os_set.cpp:173
+msgid "Set various global Services options"
+msgstr ""
+
+#: modules/core/ns_set.cpp:169
+msgid "Set your nickname password"
 msgstr ""
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 
-#: modules/core/os_set.cpp:132
-msgid "Setting for DEBUG must be , , or a positive number."
+#: modules/core/os_set.cpp:136
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr ""
 
-#: modules/core/os_set.cpp:161
-msgid "Setting for NOEXPIRE must be  or ."
+#: modules/core/os_set.cpp:166
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr ""
 
 #: modules/core/os_set.cpp:59
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr ""
 
 #: modules/core/os_set.cpp:97
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, c-format
-msgid "Signed kick option for %s is now ."
+#: modules/core/ns_set_autoop.cpp:21
+msgid "Should services op you automatically."
+msgstr ""
+
+#: modules/core/os_stats.cpp:194
+msgid "Show status of Services and network"
 msgstr ""
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:21
+msgid "Sign kicks that are done with KICK command"
+msgstr ""
+
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 msgstr ""
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
-msgid "Signed kicks"
+#: modules/core/cs_set_signkick.cpp:47
+#, c-format
+msgid "Signed kick option for %s is now off."
 msgstr ""
 
-#: modules/core/ms_rsend.cpp:53
-msgid "Sorry, RSEND has been disabled on this network."
+#: modules/core/cs_set_signkick.cpp:34
+#, c-format
+msgid "Signed kick option for %s is now on."
 msgstr ""
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
+msgid "Signed kicks"
+msgstr ""
+
+#: modules/core/ms_rsend.cpp:54
+msgid "Sorry, RSEND has been disabled on this network."
 msgstr ""
 
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr ""
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr ""
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 
@@ -4866,7 +4698,7 @@ msgstr ""
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 
@@ -4874,63 +4706,42 @@ msgstr ""
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr ""
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr ""
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr ""
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr ""
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr ""
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr ""
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr ""
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr ""
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr ""
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr ""
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr ""
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr ""
-
 #: modules/core/cs_xop.cpp:165
 #, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -4941,12 +4752,12 @@ msgstr ""
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr ""
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr ""
@@ -4956,21 +4767,16 @@ msgstr ""
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr ""
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr ""
-
-#: include/language.h:71
+#: modules/core/ns_cert.cpp:48
 #, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
+msgid "Sorry, you can only have %d certificate entries for a nickname."
 msgstr ""
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr ""
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr ""
 
@@ -4982,12 +4788,20 @@ msgstr ""
 msgid "Stop repeating yourself!"
 msgstr ""
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+msgid "Stricter control of channel founder status"
+msgstr ""
+
+#: modules/core/cs_set_secureops.cpp:21
+msgid "Stricter control of chanop status"
+msgstr ""
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr ""
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr ""
@@ -4996,21 +4810,34 @@ msgstr ""
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr ""
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+msgid "Suspend a given nick"
+msgstr ""
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr ""
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr ""
+
+#: modules/core/bs_set.cpp:151
 #, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
+msgstr ""
+
+#: modules/core/hs_group.cpp:21
+msgid "Syncs the vhost for all nicks in a group"
 msgstr ""
 
-#: src/language.cpp:129
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr ""
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5026,7 +4853,7 @@ msgid ""
 "3: ban in the form *!*user@*.domain"
 msgstr ""
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5035,7 +4862,7 @@ msgid ""
 "the LIST and INFO commands."
 msgstr ""
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5044,7 +4871,7 @@ msgid ""
 "be a registered one."
 msgstr ""
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5056,7 +4883,7 @@ msgid ""
 "next time the channel is created."
 msgstr ""
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5067,7 +4894,7 @@ msgid ""
 "in the channel."
 msgstr ""
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5078,7 +4905,7 @@ msgid ""
 "a level superior or equal to his via %s commands."
 msgstr ""
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5103,7 +4930,8 @@ msgid ""
 "set persist on or off."
 msgstr ""
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5112,7 +4940,7 @@ msgid ""
 "include the channel in any lists."
 msgstr ""
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5122,7 +4950,7 @@ msgid ""
 "instead be kicked and banned from the channel."
 msgstr ""
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5134,7 +4962,7 @@ msgid ""
 "as controlled by the access list."
 msgstr ""
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5146,7 +4974,7 @@ msgid ""
 "the access/qop command."
 msgstr ""
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5160,7 +4988,18 @@ msgid ""
 "nickname must be a registered one."
 msgstr ""
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5185,7 +5024,8 @@ msgid ""
 "causes no problem though."
 msgstr ""
 
-#: modules/core/cs_access.cpp:456
+#: modules/core/cs_access.cpp:463
+#, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5233,7 +5073,7 @@ msgid ""
 "access list."
 msgstr ""
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5260,7 +5100,7 @@ msgid ""
 "        Displays the current access list."
 msgstr ""
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5268,7 +5108,7 @@ msgid ""
 "on the given channel using the given text."
 msgstr ""
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5288,7 +5128,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5312,7 +5152,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5320,7 +5160,7 @@ msgid ""
 "akick list."
 msgstr ""
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
 "        AKILL DEL {mask | entry-num | list}\n"
@@ -5366,7 +5206,7 @@ msgid ""
 "AKILL CLEAR clears all entries of the AKILL list."
 msgstr ""
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5387,7 +5227,7 @@ msgid ""
 "prefixed by an exclamation mark."
 msgstr ""
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -5398,7 +5238,7 @@ msgid ""
 "This use limited to Services Operators."
 msgstr ""
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 msgid ""
 "Syntax: AOP channel ADD mask\n"
 "        AOP channel DEL {mask | entry-num | list}\n"
@@ -5427,20 +5267,9 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -5449,7 +5278,8 @@ msgid ""
 "your needs."
 msgstr ""
 
-#: modules/core/bs_badwords.cpp:274
+#: modules/core/bs_badwords.cpp:276
+#, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -5470,23 +5300,9 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -5496,7 +5312,7 @@ msgid ""
 "and above on the channel."
 msgstr ""
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -5519,14 +5335,14 @@ msgid ""
 "using the nick, they will be killed."
 msgstr ""
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
 "Lists all available bots on this network."
 msgstr ""
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -5534,7 +5350,21 @@ msgid ""
 "provided it has not been read at the time you use the command."
 msgstr ""
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -5542,7 +5372,7 @@ msgid ""
 "then enforces the AKILL."
 msgstr ""
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -5554,7 +5384,7 @@ msgid ""
 "+p mode."
 msgstr ""
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -5562,7 +5392,7 @@ msgid ""
 "or not. Note that this does only work with nicks, not with chans."
 msgstr ""
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -5572,7 +5402,7 @@ msgid ""
 "channel."
 msgstr ""
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -5582,22 +5412,34 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 msgstr ""
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -5605,7 +5447,7 @@ msgid ""
 "attack on the network."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
 " \n"
@@ -5618,14 +5460,14 @@ msgid ""
 "and above for self dehalfopping."
 msgstr ""
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 msgstr ""
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
 " \n"
@@ -5645,14 +5487,14 @@ msgid ""
 "      Deletes memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 msgid ""
 "Syntax: DELALL <nick>.\n"
 "Deletes the vhost for all nicks in the same group as\n"
 "that of the given nick."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
 " \n"
@@ -5664,7 +5506,7 @@ msgid ""
 "and above on the channel."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
 " \n"
@@ -5675,7 +5517,7 @@ msgid ""
 "Limited to those with founder access on the channel."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
 " \n"
@@ -5686,7 +5528,7 @@ msgid ""
 "By default, limited to the founder, or to SOPs or those with \n"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
 " \n"
@@ -5699,7 +5541,7 @@ msgid ""
 "and above for self devoicing."
 msgstr ""
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -5707,7 +5549,7 @@ msgid ""
 "channel founder."
 msgstr ""
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -5715,7 +5557,8 @@ msgid ""
 "can drop a channel for which they have not identified."
 msgstr ""
 
-#: modules/core/ns_drop.cpp:131
+#: modules/core/ns_drop.cpp:104
+#, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -5734,7 +5577,7 @@ msgid ""
 "information)."
 msgstr ""
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -5748,7 +5591,7 @@ msgid ""
 "Services Operators."
 msgstr ""
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -5790,7 +5633,7 @@ msgid ""
 "exception masks are likely to degrade services' performance."
 msgstr ""
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -5800,7 +5643,7 @@ msgid ""
 "Reason may be required on certain networks."
 msgstr ""
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -5810,7 +5653,7 @@ msgid ""
 "On certain networks, reason is required."
 msgstr ""
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -5819,14 +5662,14 @@ msgid ""
 "the command and the email it was used on will be logged."
 msgstr ""
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
 "Returns the key of the given channel."
 msgstr ""
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 msgid ""
 "Syntax: GETPASS nickname\n"
 " \n"
@@ -5836,7 +5679,7 @@ msgid ""
 "on will be logged and sent out as a WALLOPS/GLOBOPS."
 msgstr ""
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 msgid ""
 "Syntax: GHOST nickname [password]\n"
 "itermminates a \"ghost\" IRC session using your nick.  A\n"
@@ -5853,14 +5696,14 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
 "Lists all nicks in your group."
 msgstr ""
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -5881,7 +5724,7 @@ msgid ""
 "network. The message will be sent from the nick %s."
 msgstr ""
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -5890,7 +5733,8 @@ msgid ""
 "group."
 msgstr ""
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -5924,7 +5768,7 @@ msgid ""
 "Note: all the nicknames of a group have the same password."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
 " \n"
@@ -5936,7 +5780,7 @@ msgid ""
 "and above on the channel, or to HOPs or those with level 4 \n"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 msgid ""
 "Syntax: HOP channel ADD mask\n"
 "        HOP channel DEL {mask | entry-num | list}\n"
@@ -5964,19 +5808,9 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -5988,7 +5822,7 @@ msgid ""
 "command."
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -5998,7 +5832,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
 " \n"
@@ -6016,7 +5850,7 @@ msgid ""
 "Ignores will not be enforced on IRC Operators."
 msgstr ""
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -6027,7 +5861,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -6036,7 +5870,7 @@ msgid ""
 "options."
 msgstr ""
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -6046,7 +5880,7 @@ msgid ""
 "for the given channel."
 msgstr ""
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -6061,7 +5895,7 @@ msgid ""
 "admins."
 msgstr ""
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -6073,7 +5907,7 @@ msgid ""
 "time or number of channels it is on."
 msgstr ""
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -6098,7 +5932,7 @@ msgid ""
 "person who jupitered the server."
 msgstr ""
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -6108,7 +5942,8 @@ msgid ""
 "and above on the channel."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -6122,7 +5957,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -6134,7 +5969,8 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:415
+#: modules/core/bs_kick.cpp:462
+#, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -6172,7 +6008,7 @@ msgid ""
 "*** SpamMan has been kicked off channel #my_channel by %s (Alcan (Flood))"
 msgstr ""
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
 "Sets the amsg kicker on or off. When enabled, the bot will\n"
@@ -6183,7 +6019,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -6193,7 +6029,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -6209,7 +6045,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -6219,7 +6055,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -6232,7 +6068,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -6242,7 +6078,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -6252,7 +6088,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -6262,7 +6098,7 @@ msgid ""
 "the ban system once activated."
 msgstr ""
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -6291,7 +6127,7 @@ msgid ""
 "set, see HELP LEVELS DESC."
 msgstr ""
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -6305,7 +6141,7 @@ msgid ""
 "number of items to display to a operator at any 1 time."
 msgstr ""
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -6315,7 +6151,7 @@ msgid ""
 "are to be written without '#'."
 msgstr ""
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -6337,7 +6173,7 @@ msgid ""
 "        domain."
 msgstr ""
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
 " \n"
@@ -6367,7 +6203,7 @@ msgid ""
 "        Lists all registered nicks which have been set to\n"
 msgstr ""
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
 " \n"
@@ -6379,11 +6215,21 @@ msgid ""
 "      Lists memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr ""
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -6404,7 +6250,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr ""
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -6414,7 +6260,7 @@ msgid ""
 "yourself."
 msgstr ""
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -6428,16 +6274,7 @@ msgid ""
 "to re-identify. This use limited to Services Operators."
 msgstr ""
 
-#: modules/core/os_mode.cpp:46
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -6464,21 +6301,30 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
 "This command lists information about the specified loaded module"
 msgstr ""
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
 "Lists all currently loaded modules."
 msgstr ""
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -6486,14 +6332,14 @@ msgid ""
 "directory."
 msgstr ""
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 msgid ""
 "Syntax: MODRELOAD FileName\n"
 " \n"
 "This command reloads the module named FileName."
 msgstr ""
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -6501,7 +6347,7 @@ msgid ""
 "directory."
 msgstr ""
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 msgid ""
 "Syntax: NOOP SET server\n"
 "          NOOP REVOKE server\n"
@@ -6516,7 +6362,7 @@ msgid ""
 "Services."
 msgstr ""
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -6524,7 +6370,7 @@ msgid ""
 "on you will see your real IP address."
 msgstr ""
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -6533,7 +6379,7 @@ msgid ""
 "remove all flags simply type a \"-\" instead of any flags."
 msgstr ""
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -6541,7 +6387,7 @@ msgid ""
 "on you will see the vhost instead of your real IP address."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
 " \n"
@@ -6557,7 +6403,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr ""
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -6578,7 +6424,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
 " \n"
@@ -6589,7 +6435,7 @@ msgid ""
 "Limited to those with founder access on the channel."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
 " \n"
@@ -6601,7 +6447,7 @@ msgid ""
 "level 10 and above on the channel for self protecting."
 msgstr ""
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 msgid ""
 "Syntax: QOP channel ADD mask\n"
 "        QOP channel DEL {mask | entry-num | list}\n"
@@ -6629,19 +6475,9 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -6656,7 +6492,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr ""
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -6673,7 +6509,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr ""
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
 " \n"
@@ -6687,7 +6523,8 @@ msgid ""
 "      Displays memos numbered 2 through 5 and 7 through 9."
 msgstr ""
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -6713,7 +6550,8 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: modules/core/cs_register.cpp:101
+#: modules/core/cs_register.cpp:100
+#, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -6737,7 +6575,8 @@ msgid ""
 "%s%s HELP for information on how to do so."
 msgstr ""
 
-#: modules/core/ns_register.cpp:313
+#: modules/core/ns_register.cpp:218
+#, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -6772,7 +6611,7 @@ msgid ""
 "feature, type %s%s HELP GROUP."
 msgstr ""
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -6789,7 +6628,7 @@ msgid ""
 "the nickname."
 msgstr ""
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -6798,7 +6637,7 @@ msgid ""
 "session limitation, etc.)"
 msgstr ""
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -6806,7 +6645,7 @@ msgid ""
 "to the e-mail address of the user whom is performing it."
 msgstr ""
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -6821,7 +6660,7 @@ msgid ""
 "(i.e. exit and immediately re-run the executable)."
 msgstr ""
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
 " \n"
@@ -6834,14 +6673,14 @@ msgid ""
 "has been read."
 msgstr ""
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
 " \n"
 "Sets various nickname options. option can be one of:"
 msgstr ""
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
 " \n"
@@ -6850,7 +6689,7 @@ msgid ""
 "omatically when joining channels."
 msgstr ""
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -6858,14 +6697,14 @@ msgid ""
 "Services. The new display MUST be a nick of the group."
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
 "Associates the given E-mail address with the nickname."
 msgstr ""
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -6875,7 +6714,7 @@ msgid ""
 "access on it."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -6889,7 +6728,7 @@ msgid ""
 "be displayed (OFF) or hidden (ON)."
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -6908,17 +6747,7 @@ msgid ""
 "network's administrators may have disabled this option."
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:112
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -6927,7 +6756,7 @@ msgid ""
 "else they'll use notices."
 msgstr ""
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -6935,14 +6764,14 @@ msgid ""
 "to ON prevents the nickname from expiring."
 msgstr ""
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
 " \n"
 "Changes the password used to identify as the nick's owner."
 msgstr ""
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -6954,7 +6783,7 @@ msgid ""
 "information on it using the INFO command.)"
 msgstr ""
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -6968,14 +6797,14 @@ msgid ""
 "KILL option."
 msgstr ""
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
 "Makes the bot say the given text on the given channel."
 msgstr ""
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
 " \n"
@@ -6985,14 +6814,14 @@ msgid ""
 "nickname/channel must be registered."
 msgstr ""
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 msgid ""
 "Syntax: SENDALL memo-text\n"
 " \n"
 "Sends all registered users a memo containing memo-text."
 msgstr ""
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -7003,7 +6832,7 @@ msgid ""
 "May be limited to IRC operators on certain networks."
 msgstr ""
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -7021,7 +6850,7 @@ msgid ""
 "hosts and groups thereof."
 msgstr ""
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -7030,7 +6859,7 @@ msgid ""
 "well as vhosts."
 msgstr ""
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -7040,7 +6869,8 @@ msgid ""
 "will not be allowed chanop status."
 msgstr ""
 
-#: modules/core/cs_set_signkick.cpp:56
+#: modules/core/cs_set_signkick.cpp:57
+#, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -7054,19 +6884,9 @@ msgid ""
 "kicks signed. See %s%s HELP LEVELS for more information."
 msgstr ""
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-
-#: modules/core/bs_set.cpp:204
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -7084,14 +6904,14 @@ msgid ""
 "level SET."
 msgstr ""
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
 "channel by users that aren't IRC operators."
 msgstr ""
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -7101,7 +6921,7 @@ msgid ""
 "Available options:"
 msgstr ""
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -7110,7 +6930,7 @@ msgid ""
 "even if they don't match the NOKICK level."
 msgstr ""
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -7119,7 +6939,7 @@ msgid ""
 "even if they don't match the NOKICK level."
 msgstr ""
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -7137,7 +6957,7 @@ msgid ""
 "level)."
 msgstr ""
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -7147,7 +6967,7 @@ msgid ""
 "they have enough access to the channel."
 msgstr ""
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -7162,7 +6982,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -7171,7 +6991,7 @@ msgid ""
 "automatically when you enable the option."
 msgstr ""
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -7179,7 +6999,7 @@ msgid ""
 "to ON prevents the channel from expiring."
 msgstr ""
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -7190,7 +7010,8 @@ msgid ""
 "KICKs, and even the entry message."
 msgstr ""
 
-#: modules/core/ms_set.cpp:232
+#: modules/core/ms_set.cpp:231
+#, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -7205,14 +7026,14 @@ msgid ""
 "on a specific option."
 msgstr ""
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
 "Sets various nickname options.  option can be one of:"
 msgstr ""
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 msgid ""
 "Syntax: SET option setting\n"
 "Sets various global Services options.  Option names\n"
@@ -7224,7 +7045,7 @@ msgid ""
 "    LIST       List the options"
 msgstr ""
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -7232,7 +7053,7 @@ msgid ""
 "allow ChanServ to op you automatically when entering channels."
 msgstr ""
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -7240,7 +7061,7 @@ msgid ""
 "Services. The new display MUST be a nick of your group."
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -7249,7 +7070,7 @@ msgid ""
 "information on the nickname with the INFO command."
 msgstr ""
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -7259,7 +7080,7 @@ msgid ""
 "access on it."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -7273,7 +7094,7 @@ msgid ""
 "be displayed (OFF) or hidden (ON)."
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -7292,7 +7113,7 @@ msgid ""
 "network's administrators may have disabled this option."
 msgstr ""
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 msgid ""
 "Syntax: SET LANGUAGE language\n"
 " \n"
@@ -7302,7 +7123,7 @@ msgid ""
 "supported languages:"
 msgstr ""
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -7313,7 +7134,7 @@ msgid ""
 "this any higher than %d."
 msgstr ""
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -7336,14 +7157,14 @@ msgid ""
 "not set a hard limit."
 msgstr ""
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 msgstr ""
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -7352,7 +7173,7 @@ msgid ""
 "use notices."
 msgstr ""
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
 "Sets no expire mode on or off. In no expire mode, nicks,\n"
@@ -7362,7 +7183,7 @@ msgid ""
 "-noexpire."
 msgstr ""
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -7382,7 +7203,7 @@ msgid ""
 "ON is essentially LOGON and NEW combined."
 msgstr ""
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -7390,7 +7211,7 @@ msgid ""
 "owner."
 msgstr ""
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -7402,7 +7223,7 @@ msgid ""
 "information on it using the INFO command.)"
 msgstr ""
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -7419,7 +7240,7 @@ msgid ""
 "-readonly."
 msgstr ""
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -7433,7 +7254,7 @@ msgid ""
 "KILL option."
 msgstr ""
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -7442,7 +7263,7 @@ msgid ""
 "needed, and set back to OFF when no longer needed."
 msgstr ""
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
 "Sets the vhost for all nicks in the same group as that\n"
@@ -7453,14 +7274,14 @@ msgid ""
 "added to the group after this command was used."
 msgstr ""
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
 "Causes Services to save all databases and then shut down."
 msgstr ""
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
 "        SNLINE DEL {mask | entry-num | list}\n"
@@ -7507,7 +7328,7 @@ msgid ""
 "SNLINE CLEAR clears all entries of the SNLINE list."
 msgstr ""
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 msgid ""
 "Syntax: SOP channel ADD mask\n"
 "        SOP channel DEL {mask | entry-num | list}\n"
@@ -7536,19 +7357,9 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
 "        SQLINE DEL {mask | entry-num | list}\n"
@@ -7596,21 +7407,21 @@ msgid ""
 "SQLINE CLEAR clears all entries of the SQLINE list."
 msgstr ""
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 msgstr ""
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 msgid ""
 "Syntax: STAFF memo-text\n"
 " \n"
 "Sends all services staff a memo containing memo-text."
 msgstr ""
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -7636,7 +7447,7 @@ msgid ""
 "everything you'd see with MEMORY and UPLINK options."
 msgstr ""
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -7650,7 +7461,7 @@ msgid ""
 "    STATUS ERROR error-message"
 msgstr ""
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 msgid ""
 "Syntax: STATUS nickname...\n"
 " \n"
@@ -7674,7 +7485,7 @@ msgid ""
 "will be returned."
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -7685,14 +7496,14 @@ msgid ""
 "Reason may be required on certain networks."
 msgstr ""
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
 "Forcefully changes a user's nickname from nick to newnick."
 msgstr ""
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
 "        SZLINE DEL {mask | entry-num | list}\n"
@@ -7737,7 +7548,8 @@ msgid ""
 "SZLINE CLEAR clears all entries of the SZLINE list."
 msgstr ""
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -7751,16 +7563,7 @@ msgid ""
 "channel."
 msgstr ""
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -7771,7 +7574,7 @@ msgid ""
 "it entirely."
 msgstr ""
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -7783,7 +7586,7 @@ msgid ""
 "on the channel."
 msgstr ""
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -7794,7 +7597,7 @@ msgid ""
 "nick in your group."
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -7802,7 +7605,7 @@ msgid ""
 "are preserved from before the suspension."
 msgstr ""
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -7810,7 +7613,7 @@ msgid ""
 "send the command."
 msgstr ""
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -7823,7 +7626,7 @@ msgid ""
 "with the +i flag will be listed."
 msgstr ""
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
 " \n"
@@ -7836,7 +7639,7 @@ msgid ""
 "and above for self voicing."
 msgstr ""
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 msgid ""
 "Syntax: VOP channel ADD mask\n"
 "        VOP channel DEL {mask | entry-num | list}\n"
@@ -7864,19 +7667,9 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -7886,19 +7679,19 @@ msgid ""
 "Available options:"
 msgstr ""
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
 msgstr ""
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 msgstr ""
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -7906,160 +7699,183 @@ msgid ""
 "your userflags (lastseentime, etc)."
 msgstr ""
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr ""
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr ""
+
+#: modules/core/cs_invite.cpp:21
+msgid "Tells ChanServ to invite you into a channel"
+msgstr ""
+
+#: modules/core/os_noop.cpp:21
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+
+#: modules/core/os_shutdown.cpp:21
+msgid "Terminate services with save"
+msgstr ""
+
+#: modules/core/os_quit.cpp:22
+msgid "Terminate the Services program with no save"
+msgstr ""
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr ""
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr ""
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr ""
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr ""
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr ""
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr ""
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 msgid ""
 "The following feature/function names are understood. Note\n"
 "that the leves for NOJOIN is the maximum level,\n"
 "while all others are minimum levels."
 msgstr ""
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr ""
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr ""
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr ""
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr ""
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr ""
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr ""
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
 msgstr ""
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
 "for more information."
 msgstr ""
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr ""
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr ""
@@ -8080,7 +7896,7 @@ msgstr ""
 msgid "There's no email address set for your nick."
 msgstr ""
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -8090,102 +7906,92 @@ msgid ""
 "                        non IRC operators"
 msgstr ""
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr ""
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr ""
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr ""
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr ""
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr ""
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr ""
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr ""
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
+#: modules/core/ns_info.cpp:146
+msgid "This nickname is unconfirmed."
 msgstr ""
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr ""
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 msgstr ""
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+msgid "Toggle the user privilege system"
+msgstr ""
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr ""
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr ""
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+msgid "Topic can only be changed with TOPIC"
+msgstr ""
+
+#: modules/core/cs_set_topiclock.cpp:38
+#, c-format
+msgid "Topic lock option for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_topiclock.cpp:33
 #, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now on."
 msgstr ""
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_keeptopic.cpp:38
 #, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, c-format
+msgid "Topic retention option for %s is now on."
 msgstr ""
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr ""
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+msgid "Turn nickname security on or off"
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:21
+msgid "Turn protection on or off"
+msgstr ""
+
+#: modules/core/ms_help.cpp:43
+#, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -8194,155 +8000,175 @@ msgid ""
 "    changed with the %s LEVELS command."
 msgstr ""
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
 "nickname."
 msgstr ""
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
 msgstr ""
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
 msgstr ""
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-
 #: src/memoserv.cpp:73
+#, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr ""
 
 #: src/memoserv.cpp:70
+#, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr ""
 
 #: src/memoserv.cpp:62
+#, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr ""
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
+#: src/users.cpp:371
+#, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
 msgstr ""
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr ""
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr ""
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr ""
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr ""
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+msgid "Un-Load a module"
+msgstr ""
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr ""
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr ""
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
-#, c-format
-msgid "Unknown SASET option %s."
+#: modules/core/bs_unassign.cpp:21
+msgid "Unassigns a bot from a channel"
 msgstr ""
 
-#: include/language.h:54
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
-msgid "Unknown SET option %s."
+msgid "Unknown SASET option %s."
 msgstr ""
 
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr ""
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, c-format
 msgid "Unknown mode character %c ignored."
 msgstr ""
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr ""
 
-#: include/language.h:41
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+#: modules/core/ns_suspend.cpp:105
+msgid "Unsuspend a given nick"
+msgstr ""
+
+#: modules/core/ns_update.cpp:21
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr ""
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr ""
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr ""
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr ""
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr ""
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
 msgstr ""
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 msgid "VOICE [#channel] [nick]"
 msgstr ""
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr ""
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr ""
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+msgid "View the list of host sessions"
+msgstr ""
+
+#: modules/core/cs_modes.cpp:161
+msgid "Voices a selected nick on a channel"
+msgstr ""
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr ""
 
@@ -8364,16 +8190,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr ""
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr ""
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr ""
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr ""
@@ -8382,11 +8208,7 @@ msgstr ""
 msgid "You are no longer a SuperAdmin"
 msgstr ""
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr ""
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr ""
 
@@ -8394,58 +8216,61 @@ msgstr ""
 msgid "You are now a SuperAdmin"
 msgstr ""
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr ""
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
 msgstr ""
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr ""
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr ""
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr ""
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr ""
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr ""
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr ""
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr ""
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
 "Type %s%s HELP command for more information."
 msgstr ""
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -8453,61 +8278,72 @@ msgid ""
 msgstr ""
 
 #: modules/core/cs_xop.cpp:370
+#, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
 msgstr ""
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr ""
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr ""
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr ""
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr ""
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr ""
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr ""
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr ""
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr ""
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -8517,81 +8353,65 @@ msgstr ""
 msgid "You have 1 new memo."
 msgstr ""
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr ""
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr ""
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr ""
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr ""
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr ""
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr ""
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
+#: modules/core/cs_register.cpp:47
+msgid "You must be a channel operator to register the channel."
 msgstr ""
 
-#: modules/core/cs_register.cpp:48
-msgid "You must be a channel operator to register the channel."
+#: modules/core/cs_register.cpp:37
+msgid "You must confirm your account before you can register a channel."
 msgstr ""
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
 "case you forget it."
 msgstr ""
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr ""
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr ""
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr ""
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr ""
 
@@ -8599,7 +8419,7 @@ msgstr ""
 msgid "You will no longer be informed via email."
 msgstr ""
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr ""
 
@@ -8607,16 +8427,19 @@ msgstr ""
 msgid "You will now be informed about new memos via email."
 msgstr ""
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr ""
 
+#: modules/core/ns_register.cpp:280
+msgid "Your account is already confirmed."
+msgstr ""
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 msgid "Your auto join list is empty."
 msgstr ""
@@ -8631,93 +8454,110 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+msgid "Your certificate list is empty."
+msgstr ""
+
+#: modules/core/ns_set_email.cpp:176
+#, c-format
+msgid "Your email address has been changed to %s."
+msgstr ""
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr ""
+
+#: modules/core/ms_ignore.cpp:75
 msgid "Your memo ignore list is empty."
 msgstr ""
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr ""
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr ""
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr ""
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr ""
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr ""
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
 msgstr ""
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr ""
 
-#: modules/core/ns_group.cpp:79
+#: modules/core/ns_group.cpp:78
+#, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr ""
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr ""
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr ""
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr ""
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr ""
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr ""
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr ""
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr ""
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr ""
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr ""
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr ""
 
@@ -8736,94 +8576,95 @@ msgstr ""
 msgid "[Random News - %s] %s"
 msgstr ""
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr ""
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr ""
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr ""
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr ""
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr ""
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr ""
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr ""
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr ""
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr ""
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr ""
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr ""
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr ""
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr ""
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr ""
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr ""
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr ""
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr ""
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
+#, c-format
+msgid "xOP lists system for %s is now off."
+msgstr ""
+
+#: modules/core/cs_set_xop.cpp:71
 #, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now on."
 msgstr ""
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr ""
 
diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po
index 3534732e0..b69c63141 100644
--- a/language/anope.pt_PT.po
+++ b/language/anope.pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 21:02-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -16,91 +16,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "Digite /msg %s HELP %s para maiores informações."
-
-#: modules/core/ns_help.cpp:33
-msgid ""
-"%s allows you to \"register\" a nickname and\n"
-"prevent others from using it. The following\n"
-"commands allow for registration and maintenance of\n"
-"nicknames; to use them, type %s%s command.\n"
-"For more information on a specific command, type\n"
-"%s%s HELP command."
-msgstr ""
-"%s permite que você \"registre\" um nick e evita que outras\n"
-"pessoas o utilizem. Os seguintes comandos permitem o\n"
-"registro e a manutenção dos nicks; para utilizá-los, digite\n"
-"/msg %s comando. Para mais informações sobre um\n"
-"comando específico, digite /msg %s HELP comando."
-
-#: modules/core/bs_help.cpp:35
-msgid ""
-"%s allows you to have a bot on your own channel.\n"
-"It has been created for users that can't host or\n"
-"configure a bot, or for use on networks that don't\n"
-"allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
-msgstr ""
-"%s permite que você tenha um bot no seu canal.\n"
-"Foi criado para usuários que não tem como hospedar\n"
-"ou configurar um bot, ou para Redes que não permitem\n"
-"aos usuários terem um bot. Os comandos disponíveis \n"
-"estão listados abaixo; para usá-los, digite\n"
-"/msg %s comando. Para informações mais específicas\n"
-"sobre um comando, digite /msg %s HELP comando."
-
-#: modules/core/cs_help.cpp:35
-#, fuzzy
-msgid ""
-"%s allows you to register and control various\n"
-"aspects of channels. %s can often prevent\n"
-"malicious users from \"taking over\" channels by limiting\n"
-"who is allowed channel operator privileges. Available\n"
-"commands are listed below; to use them, type\n"
-"%s%s command. For more information on a\n"
-"specific command, type %s%s HELP command."
-msgstr ""
-"%s permite que você registre e controle vários\n"
-"aspectos do canal. %s pode prevenir o \"take over\"\n"
-"do canal por usuários maliciosos, limitando quem possui\n"
-"o privilégio de OP do canal. Os comandos disponíveis\n"
-"estão listados abaixo; para usá-los, digite\n"
-"/msg %s comando. Para mais informações sobre\n"
-"um comando específico, digite /msg %s HELP comando."
-
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s é um serviço que permite aos usuários de IRC\n"
-"enviar curtas mensagens a outros usuários, mesmo\n"
-"que eles estejam conectados no momento ou não; ou\n"
-"a canais(*). Ambos, destinatários e remetentes,\n"
-"devem possuir seus nicks (ou canais) registrados para\n"
-"que possam enviar uma mensagem (memo).\n"
-"Os comandos do %s são:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
 #, c-format
 msgid "%s Changed the DEFCON level to %d"
 msgstr "%s alterou o Nível do DEFCON para %d"
 
-#: modules/core/cs_access.cpp:238
+#: modules/core/cs_access.cpp:244
 #, c-format
 msgid "%s added to %s access list at level %d."
 msgstr "%s adicionado à lista de acesso do %s com o nível %d."
 
-#: modules/core/cs_akick.cpp:281
+#: modules/core/cs_akick.cpp:280
 #, c-format
 msgid "%s added to %s autokick list."
 msgstr "%s adicionado à lista de akick do %s."
@@ -135,61 +61,125 @@ msgstr "%s adicionado à lista de SZLINE."
 msgid "%s added to your access list."
 msgstr "%s adicionado em sua lista de acesso."
 
-#: modules/core/ms_ignore.cpp:54
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s adicionado em sua lista de acesso."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s adicionado em sua lista de acesso."
+
+#: modules/core/ms_ignore.cpp:55
 #, fuzzy, c-format
 msgid "%s added to your ignore list."
 msgstr "%s adicionado em sua lista de acesso."
 
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s allows you to \"register\" a nickname and\n"
+"prevent others from using it. The following\n"
+"commands allow for registration and maintenance of\n"
+"nicknames; to use them, type %s%s command.\n"
+"For more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s permite que você \"registre\" um nick e evita que outras\n"
+"pessoas o utilizem. Os seguintes comandos permitem o\n"
+"registro e a manutenção dos nicks; para utilizá-los, digite\n"
+"/msg %s comando. Para mais informações sobre um\n"
+"comando específico, digite /msg %s HELP comando."
+
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to have a bot on your own channel.\n"
+"It has been created for users that can't host or\n"
+"configure a bot, or for use on networks that don't\n"
+"allow user bots. Available commands are listed \n"
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
+msgstr ""
+"%s permite que você tenha um bot no seu canal.\n"
+"Foi criado para usuários que não tem como hospedar\n"
+"ou configurar um bot, ou para Redes que não permitem\n"
+"aos usuários terem um bot. Os comandos disponíveis \n"
+"estão listados abaixo; para usá-los, digite\n"
+"/msg %s comando. Para informações mais específicas\n"
+"sobre um comando, digite /msg %s HELP comando."
+
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
+msgid ""
+"%s allows you to register and control various\n"
+"aspects of channels. %s can often prevent\n"
+"malicious users from \"taking over\" channels by limiting\n"
+"who is allowed channel operator privileges. Available\n"
+"commands are listed below; to use them, type\n"
+"%s%s command. For more information on a\n"
+"specific command, type %s%s HELP command."
+msgstr ""
+"%s permite que você registre e controle vários\n"
+"aspectos do canal. %s pode prevenir o \"take over\"\n"
+"do canal por usuários maliciosos, limitando quem possui\n"
+"o privilégio de OP do canal. Os comandos disponíveis\n"
+"estão listados abaixo; para usá-los, digite\n"
+"/msg %s comando. Para mais informações sobre\n"
+"um comando específico, digite /msg %s HELP comando."
+
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s já existe na lista de palavrões do %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s já existe na lista de akick do %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s já se encontra na lista de AKILL."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s já existe na lista de EXCEPTION."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s já existe na lista de SNLINE."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s já existe na lista de SQLINE."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s já existe na lista de SZLINE."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s não pode ser colocado como tempo para ban."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s alterou seus modos de usuário."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -203,42 +193,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s deletado da lista de AOP do %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s removido da lista de acesso do %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s removido da lista de akick do %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s removido da lista de palavrões do %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s removido da lista de limite de sessões."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s removido da lista de AKILL."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s removido da lista de SNLINE."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s removido da lista de SQLINE."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s removido da lista de SZLINE."
@@ -248,71 +238,80 @@ msgstr "%s removido da lista de SZLINE."
 msgid "%s deleted from your access list."
 msgstr "%s removido da sua lista de acesso."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s removido da sua lista de acesso."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s removido da sua lista de acesso."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s desabilitado no canal %s."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s possui muitos canais registrados."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s é um serviço que permite aos usuários de IRC\n"
+"enviar curtas mensagens a outros usuários, mesmo\n"
+"que eles estejam conectados no momento ou não; ou\n"
+"a canais(*). Ambos, destinatários e remetentes,\n"
+"devem possuir seus nicks (ou canais) registrados para\n"
+"que possam enviar uma mensagem (memo).\n"
+"Os comandos do %s são:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s já está coberto pelo AKILL %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s adicionado em sua lista de acesso."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s não é um ban válido."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s não é um bot válido ou um canal registrado."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s não é um endereço de e-mail válido."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s não está atualmente no canal %s."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s não encontrado na lista de Ignore."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s combina com uma Except no %s e não pode ser banido até que a Except sejá "
-"removida."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -323,12 +322,12 @@ msgstr "%s movido para a lista de AOP do %s."
 msgid "%s not found on %s %s list."
 msgstr "Nick %s não encontrado na lista de AOP do %s."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s não foi encontrado na lista de acesso do %s."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s não encontrado na lista de akick do %s."
@@ -338,32 +337,32 @@ msgstr "%s não encontrado na lista de akick do %s."
 msgid "%s not found on %s bad words list."
 msgstr "%s não foi encontrado na lista de palavrões do %s."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s não encontrado na lista de Limite de Sessões."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s não encontrado na lista de limite de sessões."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s não encontrado na lista de AKILL."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s não encontrado na lista de SNLINE."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s não encontrado na lista de SQLINE."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s não foi encontrado na lista de SZLINE."
@@ -373,12 +372,17 @@ msgstr "%s não foi encontrado na lista de SZLINE."
 msgid "%s not found on your access list."
 msgstr "%s não foi encontrado em sua lista de acesso."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s não foi encontrado em sua lista de acesso."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s removido da sua lista de acesso."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -402,18 +406,12 @@ msgstr "%s agora será ignorado por %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s agora será permanentemente ignorado."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Aviso: Todos os comandos enviados para o %s são gravados!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Atenção: Os services estão no modo somente leitura; as mudanças não serão "
-"salvas!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -421,12 +419,13 @@ msgstr ""
 "Lembrete: As máscaras de AKILL não devem conter o nick; tenha certeza de que "
 "você não incluiu o nick na máscara."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr ""
 "Lembrete: você pode apenas adicionar endereços de IP para a lista de SZLINE."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -476,22 +475,22 @@ msgstr "[Auto-Memo] O memo que você enviou foi lido."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER senha email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER senha email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP alvo senha"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -508,7 +507,7 @@ msgstr ""
 "outras atitudes mau intencionadas. O abuso do %s\n"
 "resultará em, no mínimo, perda do(s) nick(s) abusivo(s). "
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -521,7 +520,8 @@ msgstr ""
 "também ver as listas de acesso, AKICK, e níveis de qualquer\n"
 "canal."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -532,985 +532,343 @@ msgstr ""
 "sem ser necessário se identificar como dono dele, e podem ver a lista de\n"
 "acesso de qualquer nick (/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "                Opções: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "                   vHost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "                   vHost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Nick do bot: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           Nick do bot: nenhum associado no momento."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "                  Opções: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "         Kick por Caps: %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "         Kick por Caps: %s (%d kick(s) para banir; mínimo %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "         Kick por Caps: %s (mínimo %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "             Fundador: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "          Tipo de ban: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "      Kick por negrito: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "      Kick por negrito: %s (%d kick(s) para banir)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "        Kick por flood: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "        Kick por flood: %s (%d kick(s) para banir; %d linhas em %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "        Kick por flood: %s (%d linhas em %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "       Máscara: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "        Kick por cores: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "        Kick por cores: %s (%d kick(s) para banir)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "            Expira em: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "          Tipo de ban: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "           Último uso: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "        Trava de modo: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "    Kick por repetição: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "    Kick por repetição: %s (%d kick(s) para banir; %d vezes)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "    Kick por repetição: %s (%d vezes)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "             Sucessor: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "             Suspenso: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "         Kick por Caps: %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "      Kick por negrito: %s (%d kick(s) para banir)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "       Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "       Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "        Último tópico: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "           Registrado: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (desabilitado)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (founder apenas)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Modifica a lista de endereços autorizados"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Modifica a lista de usuários privilegiados"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"    ACT                Faz com que o bot faça o mesmo que o comando \"/me\""
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Manipula a lista de AKILL"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      Lista todos os canais nos quais você tem acesso"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Modifica a lista de AOP (AutoOP) de um canal"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "    ASSIGN             Associa um bot ao canal"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "    BADWORDS           Configura os palavrões"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bane o nick selecionado em um canal"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       Ajusta como os Services devem fazer o ban"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "    BOT                Mantém a lista de bots da Rede"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "    BOTLIST            Lista os bots disponíveis"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL   Cancela o último memo enviado por você"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL todos os usuários de um canal específico"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Lista todos os canais em uso na Rede"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK    Verifica se o último memo enviado para um nick foi lido"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Diz ao ChanServ para remover certos ajustes de um canal"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirma um código de autorização do NickServ"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "        Criado: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipula o sistema DefCon"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Retira o status de HalfOP de um nick no canal"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Deleta o vHost de outro usuário"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL      Apaga a(s) mensagem(ns)"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Deleta o vHost de todos os nicks de um grupo"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Retira o status de OP de um nick no canal"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Retira seu status de Owner no canal"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Desprotege um determinado nick no canal"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Ajusta a descrição do canal"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Retira o status de Voice de um nick no canal"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Mostra o seu grupo nos Services"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Cancela o registro de um canal"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Cancela o registro de um nick"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "            Descrição: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Associa um endereço de e-mail ao seu nick"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Modifica a lista de limite de sessões"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Previne um canal de ser registrado/usado"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Previne um nick de ser usado ou registrado"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Ajusta o fundador do canal"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Encontra e retorna todos os usuários que se\n"
-"                   registraram usando o email fornecido"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Retorna a key (do modo +k) do canal fornecido"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr "    GETPASS    Recupera a senha de um determinado nick"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr ""
-"    GHOST      Termina uma sessão \"fantasma\" de IRC que esteja usando seu "
-"nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lista todos os nicks do seu grupo"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Envia uma mensagem para todos usuários"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Associa uma mensgem de entrada ao seu nick"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr ""
-"    GROUP       Sincroniza um mesmo vHost para todos os nicks de um grupo"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Se junta a um grupo"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "     Mensagem de entrada: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Atribui status de HalfOP a um nick no canal"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Esconde certas informações sobre seu nick"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Modifica a lista de HOP (HalfOP) de um canal"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Identifica seu nick com sua senha"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"    INFO               Permite que você veja informações do BotServ sobre um "
-"canal ou bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Mostra informações sobre algum nick registrado"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Mostra informações sobre algum canal registrado"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO     Exibe informações sobre suas mensagens"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        Jupa um servidor"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     Mantem o tópico quando o canal não está em uso"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "    KICK               Configura os kickers"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Kicka um usuário de um canal"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicka (expulsa) um nick de um canal"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Ativa/Desativa a proteção de kill para o seu nick"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Ajusta a linguagem dos Services quando\n"
-"                   mensagens são enviadas à você"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Redefine os níveis de acesso"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Exibe uma ou mais entradas de vHost"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       Lista todos os nicks registrados que combinam com o padrão "
-"fornecido"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lista todos os canais registrados que combinam com o padrão "
-"fornecido"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST     Lista suas mensagens"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr "    LOGONNEWS   Define mensagens a serem mostradas na conexão"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverte o efeito do comando IDENTIFY"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Muda o modo de um canal"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Limpa os modos de um canal"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Informação sobre um módulo carregado"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Lista os módulos carregados"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Carrega um módulo"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Carrega um módulo"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Descarrega um módulo"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Altera o método de comunicação dos Services"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Remove temporariamente todas as O:lines de um \n"
-"                  servidor remotamente"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Desativa seu vHost associado"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Dá flags de Operador a um determinado usuário"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Ativa seu vHost associado"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Atribui status de OP a um nick no canal"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS    Define mensagens a serem mostradas a quem pega Oper"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      Envia uma notice quando os comandos OP/DEOP são usados"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Concede-lhe status de Owner no canal"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "        Opções: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Ajusta a senha do seu nick"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         Regula o uso de comandos críticos"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       Esconde o canal do comando LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protege um determinado nick no canal"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Termina os Services sem salvar os dados"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr "    RANDOMNEWS  Define mensagens a serem mostradas ao azar na conexão"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ     Lê a(s) mensagem(ns)"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Derruba usuário que esteja usando seu nick"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Registra um nick"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Registra um nick"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr "    RELEASE    Retoma a custódia do seu nick após um RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Reenvia um código de autorização do NickServ"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Salva os dados e reinicia os Services"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Acesso restrito ao canal"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND    Envia um memo e pede uma confirmação de leitura"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "     Kick por reversos: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick por reversos: %s (%d kick(s) para banir)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"    SAY                Faz com que o bot diga determinado texto no canal dado"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        Ativa os recursos de segurança do %s"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER Controle rigoroso do status de Fundador do Canal"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Controle rigoroso do status de OP"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND     Envia uma mensagem para um nick ou para um canal"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Envia um memo para todos os usuários registrados"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Esqueceu sua senha? Tente isto"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Mostra a lista de sessões de host"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "    SET                Configura as opções do bot"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Ajusta o vHost de outro usuário"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Configura várias opções globais dos Services"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Ajusta as opções e informações do canal"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Ajusta opções, incluindo proteção de kill"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET      Ajusta opções relacionadas às mensagens"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Ajusta o vHost de todos os nicks de um grupo"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Termina os Services salvando os dados"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      Assinatura dos kicks feitos pelo comando KICK"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Manipula a lista de SNLINE"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Modifica a lista de SOP (SuperOP) de um canal"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Manipula a lista de SQLINE"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr ""
-"    STAFF       Exibe os membros da Staff dos Services e seu status online"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF    Envia um memo para todos os opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Mostra estatísticas dos Services e da Rede"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Fornece o atual nível de acesso de um usuário em um canal"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Retorna o status do owner de um determinado nick"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Ajusta o sucessor do canal"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Previne um canal de ser registrado/usado,\n"
-"               preservando os dados do canal e suas configurações"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspende o nick fornecido"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Força a mudança do nick de um usuário"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Manipula a lista de SZLINE"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Modifica o tópico de um canal"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     O tópico pode ser mudado apenas com o comando TOPIC"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Altera os modos de um usuário"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "    UNASSIGN           Desassocia um bot de um canal"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Libera um canal suspenso"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Libera o nick fornecido"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr "    UPDATE      Salva os dados atuais dos Services"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Atualiza seu status atual, ou seja, verifica novos memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Lista todos os usuários online na Rede"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "      Usado em: %d canal(is)"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Atribui status de Voice a um nick no canal"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Modifica a lista de VOP (VOicePeople) de um canal"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Altera o sistema de privilégio de usuário"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expira em %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "     Kick por palavrão: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "     Kick por palavrão: %s (%d kick(s) para banir)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "                  E-mail: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "          Está online em: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "    Último horário visto: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "           Tópico por: %s"
@@ -1520,20 +878,6 @@ msgstr "           Tópico por: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1544,26 +888,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1573,99 +908,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s %s"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "      RealName: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "        Hora de registro: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "   Kick por sublinhado: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "   Kick por sublinhado: %s (%d kick(s) para banir)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Núm  Remetente            Data/Hora"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        Jupa um servidor"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vHost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vHost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, fuzzy, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (por %s em %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (por %s em %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1684,17 +1002,12 @@ msgstr ""
 "%5d (%s por %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Comandos do %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s não é notificado de novos memos."
@@ -1704,34 +1017,34 @@ msgstr "%s não é notificado de novos memos."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (por %s em %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d módulos carregados."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bots disponíveis."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "%d nicks no grupo."
@@ -1742,14 +1055,14 @@ msgstr "%d nicks no grupo."
 msgid "%s %s list is empty."
 msgstr "Lista de AOP do canal %s está vazia."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista de acesso do canal %s está vazia."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Lista de akick do %s vazia."
@@ -1759,7 +1072,7 @@ msgstr "Lista de akick do %s vazia."
 msgid "%s bad words list is empty."
 msgstr "Lista de palvrões do %s está vazia."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s não pode ser o successor do canal %s porque ele é o founder."
@@ -1769,47 +1082,47 @@ msgstr "%s não pode ser o successor do canal %s porque ele é o founder."
 msgid "%s cannot receive memos."
 msgstr "%s não pode receber memos."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Comandos do %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "Máscara %s é muito grande; por favor seja mais específico."
+msgid "%s commands:"
+msgstr "Comandos do %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s possui atualmente %d memos, dos quais %d não foram lidos."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s possui atualmente %d memos, dos quais 1 não foi lido."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s possui atualmente %d memos."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s possui atualmente %d memos; dos quais nenhum foi lido."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s possui atualmente 1 memo, e ainda não foi lido."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s possui atualmente 1 memo."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s não possui nenhum memo atualmente."
@@ -1819,47 +1132,27 @@ msgstr "%s não possui nenhum memo atualmente."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s possui muitos memos atualmente e não pode receber mais nenhum."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s não possui limite de memos."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s não possui memos."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s não possui novos memos."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s é %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s não está conectado no momento."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s está online neste momento."
@@ -1881,23 +1174,23 @@ msgstr "%s está ativada"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s não é mais um Super-Admin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s não é notificado de novos memos."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s é notificado de novos memos quando conecta e quando eles são enviados."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s é notificado de novos memos quando conecta."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s é notificado de novos memos quando eles são enviados."
@@ -1916,6 +1209,11 @@ msgstr ""
 "Lista de AOP para %s:\n"
 "  Núm  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1958,63 +1256,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) adicionado à lista de bots."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Limite de memos para %s é de %d, e não pode ser alterado."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Limite de memos para %s é de %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILLA quaisquer novos clientes conectando"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Força os Modos de Canal (%s) a serem setados em todos os canais"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignora quaisquer não-opers com mensagem"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Killa quaisquer NOVOS clientes conectando"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Impedida a mudança de MLOCK"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Impedido o registro de novos canais"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Impede o envio de novos memos"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Impedido o registro de novos nicks"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Silenciosamente ignora não-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Usa o limite de sessões reduzido de %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<desconhecido>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "Uma mensagem global foi enviada a todos os usuários registrados."
 
@@ -2026,38 +1327,29 @@ msgid ""
 msgstr ""
 "Um memo de notificação foi enviado para %s informando que você leu seu memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "O passcode foi enviado para %s, por favor digite /msg %s confirm <passcode> "
 "para completar o registro."
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "O Ident de um vhost deve estar no formato de um Ident válido."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Erro! Um vhost pode conter apenas A-Z, a-z, 0-9, '.' e '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS canal {ADD|DEL|LIST|VIEW|CLEAR} [nick [nível] | lista-entradas]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [máscara]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT canal texto"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [máscara]"
@@ -2071,17 +1363,22 @@ msgstr ""
 "AKICK canal {ADD|STICK|UNSTICK|DEL|LIST|VIEW|ENFORCE|CLEAR} [nick-ou-"
 "máscara] [motivo]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE para %s terminado; %d usuários afetados."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL todos os usuários de um canal específico"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "A lista de AKILL está vazia."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2089,43 +1386,34 @@ msgid ""
 msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} [motivo]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN canal nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Acesso negado."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Nível de acesso para %s no %s alterado para %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Nível de acesso para %s no %s não alterado %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "O nível de acesso deve ser entre %d e %d inclusive."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "O nível de acesso deve ser diferente de zero."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Opções de nível de acesso para o canal %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Níveis de acesso para o %s redefinidos para o padrão."
@@ -2140,20 +1428,11 @@ msgstr "Lista de acesso para %s está vazia."
 msgid "Access list for %s:"
 msgstr "Lista de acesso para %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Lista de acesso para %s:\n"
-"  Num   Nív  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Lista de acesso:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2162,6 +1441,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        Ativa os recursos de segurança do %s"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Ativa seu vHost associado"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2182,7 +1471,7 @@ msgstr "Adicionado novo OperNews (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Adicionada novo item RandomNews (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2195,22 +1484,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Todas as O:lines do servidor %s foram removidas."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Todas as O:lines do servidor %s foram resetadas."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
@@ -2219,12 +1508,12 @@ msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 msgid "All logon news items deleted."
 msgstr "Todos os logon news foram removidos."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Todos os memos para o canal %s foram apagados."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Todos os seus memos foram apagados."
 
@@ -2236,22 +1525,22 @@ msgstr "Todos os OperNews foram removidos."
 msgid "All random news items deleted."
 msgstr "Todos os itens RandomNews deletados."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Todos os usuários foram kickados do canal %s."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Todos os vhost's no grupo %s foram ajustados para %s@%s"
@@ -2373,12 +1662,34 @@ msgstr "Permitido o uso do comando FANTASY de bots"
 msgid "Allowed to view the access list"
 msgstr "Permitido visualizar a lista de acesso"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"    INFO               Permite que você veja informações do BotServ sobre um "
+"canal ou bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "    ASSIGN             Associa um bot ao canal"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Associa uma mensgem de entrada ao seu nick"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Associa um endereço de e-mail ao seu nick"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Lista de akick para %s:"
@@ -2403,17 +1714,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Modo +v automático"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS canal {ADD|DEL|LIST|CLEAR} [palavra | lista] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2432,26 +1743,26 @@ msgstr ""
 "Lista de palavrões do %s:\n"
 "  Núm   Palavra                        Tipo"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Lista de palavrões está agora vazia."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Tipo de ban para o canal %s é agora #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bane o nick selecionado em um canal"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Bot %s já existe."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Bot %s não existe."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Bot %s foi associado ao canal %s."
@@ -2466,27 +1777,27 @@ msgstr "Bot %s foi alterado para %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Bot %s foi removido."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s já está associado ao canal %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot irá kickar OPs no canal %s."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot irá kickar voices no canal %s."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot não irá kickar OPs no canal %s."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot não irá kickar voices no canal %s."
@@ -2516,16 +1827,11 @@ msgstr "A Identd do bot deve conter apenas caracteres válidos."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "O Nick do bot deve conter apenas caracteres válidos a Nicks."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Bot não está no canal %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Lista de bots:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2534,7 +1840,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2545,7 +1851,7 @@ msgstr ""
 "após %d kicks no mesmo usuário. Use o comando BADWORDS\n"
 "para adicionar ou remover um palavrão."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2553,7 +1859,7 @@ msgstr ""
 "O bot irá agora kickar por palavrões. Use o comando\n"
 "BADWORDS para adicionar ou remover um palavrão."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2562,11 +1868,11 @@ msgstr ""
 "O bot irá agora kickar por negritos, e irá setar um ban \n"
 "após %d kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "O bot irá agora kickar por negritos."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2577,7 +1883,7 @@ msgstr ""
 "%d caracteres e %d%% na mensagem inteira), e irá setar\n"
 "um ban após %d kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2586,7 +1892,7 @@ msgstr ""
 "O bot irá agora kickar por caps (deve ter no mínimo\n"
 "%d caracteres e %d%% na mensagem inteira)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2595,11 +1901,11 @@ msgstr ""
 "O bot irá agora kickar por cores, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "O bot irá agora kickar por cores."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2608,12 +1914,12 @@ msgstr ""
 "O bot irá agora kickar por flood (%d linhas em %d segundos), e \n"
 "setar um ban após %d kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "O bot irá agora kickar por flood (%d linhas em %d segundos)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2622,11 +1928,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2637,7 +1943,7 @@ msgstr ""
 "%d vezes a mesma coisa), e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2646,7 +1952,7 @@ msgstr ""
 "O bot irá agora kickar por repetição (usuários que escreverem\n"
 "%d vezes a mesma coisa)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2655,11 +1961,11 @@ msgstr ""
 "O bot irá agora kickar por reversos, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "O bot irá agora kickar por reversos."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2668,16 +1974,16 @@ msgstr ""
 "O bot irá agora kickar por sublinhados, e irá setar um ban após %d \n"
 "kicks no mesmo usuário."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "O bot irá agora kickar por sublinhados."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "O bot irá agora kickar por cores."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2686,182 +1992,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "O bot não irá mais kickar por palavrões."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "O bot não irá mais kickar por negritos."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "O bot não irá mais kickar por caps."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "O bot não irá mais kickar por cores."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "O bot não irá mais kickar por flood."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "O bot não irá mais kickar por repetição."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "O bot não irá mais kickar por reversos."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "O bot não irá mais kickar por sublinhados."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "O bot não irá mais kickar por caps."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ       : %6d registros, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Bots reservados aos Operadores de IRC:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Bytes lidos   : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Bytes escritos: %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [texto|núm]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nick"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES canal[ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR canal opção"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL   Cancela o último memo enviado por você"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Cancela o registro de um canal"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Cancela o registro de um nick"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Não foi possível enviar e-mail agora; tente novamente mais tarde."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Lista de bots:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Lista de acesso para %s está vazia."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Lista de acesso para %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ      : %6d registros, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Modos do usuário %s alterados."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s alterou seus modos de usuário."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "O canal %s não existe."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Altera o método de comunicação dos Services"
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Modos do usuário %s alterados."
+
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "O canal %s foi desregistrado."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Canal %s foi bloqueado por %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "O canal %s já está registrado!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Canal %s está agora bloqueado."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Canal %s está agora liberado."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Canal %s está agora suspenso."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "O canal %s não está registrado."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "O canal %s não pode ser registrado ou usado."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "O canal %s não pode ser registrado."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "O canal %s está registrado sob seu nick: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Canais        : %6d registros, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "O canal %s irá expirar."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "O canal %s não irá expirar."
@@ -2871,33 +2202,28 @@ msgstr "O canal %s não irá expirar."
 msgid "Channel %s %s list has been cleared."
 msgstr "Lista de AOP do canal %s foi limpa."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista de acesso do canal %s apagada."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Lista de akick do canal %s foi limpa."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Canal %s está agora liberado."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINEs de canal não são suportadas por este IRCd, então você não pode usá-"
 "las."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2905,7 +2231,7 @@ msgstr ""
 "Lista de canais:\n"
 "Nome              Usuários Tópico"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2914,7 +2240,7 @@ msgstr ""
 "Canais nos quais %s tem acesso:\n"
 "  Núm  Canal                Nível    Descrição "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2922,16 +2248,47 @@ msgstr ""
 "Canais nos quais você tem acesso:\n"
 "  Núm  Canal                Nível    Descrição"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK    Verifica se o último memo enviado para um nick foi lido"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "    SET                Configura as opções do bot"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "    KICK               Configura os kickers"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirma um código de autorização do NickServ"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Limpa os modos de um canal"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Impossível liberar canal %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Lista de AKILL atual:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2939,15 +2296,15 @@ msgstr ""
 "Lista de AKILL atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Lista de Módulos atual:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Lista de SNLINE atual:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2955,11 +2312,11 @@ msgstr ""
 "Lista de SNLINE atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Lista de SQLINE atual:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2967,11 +2324,11 @@ msgstr ""
 "Lista de SQLINE atual:\n"
 "  Núm   Máscara                           Motivo"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Lista atual de SZLINE:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2980,7 +2337,7 @@ msgstr ""
 "  Núm   Máscara                           Motivo"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Atual lista de Limite de sessões:"
 
@@ -3004,56 +2361,61 @@ msgstr "Número atual de SQLINEs: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Número atual de SZLINEs: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Usuários atuais: %d (%d ops)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [canal] {núm | list | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP canal"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Desativa seu vHost associado"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3178,6 +2540,41 @@ msgstr "Tempo atual de expiração de SZLINE: 1 minuto"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Tempo atual de expiração de SZLINE: Não expira"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr "    LOGONNEWS   Define mensagens a serem mostradas na conexão"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr "    LOGONNEWS   Define mensagens a serem mostradas na conexão"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS    Define mensagens a serem mostradas a quem pega Oper"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Retira o status de HalfOP de um nick no canal"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL      Apaga a(s) mensagem(ns)"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Deleta o vHost de todos os nicks de um grupo"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Deleta o vHost de outro usuário"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3188,7 +2585,7 @@ msgstr "Deletadas %d entradas da lista de AOP do %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "Removidas %d entradas da lista de acesso do %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Removidas %d entradas da lista de akick do %s."
@@ -3228,7 +2625,7 @@ msgstr "Removidas %d entradas da lista de SZLINE."
 msgid "Deleted 1 entry from %s access list."
 msgstr "Removida 1 entrada da lista de acesso do %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Removida 1 entrada da lista de akick do %s."
@@ -3263,32 +2660,77 @@ msgstr "Removida 1 entrada da lista de SZLINE."
 msgid "Deleted one entry from %s %s list."
 msgstr "Deletada 1 entrada da lista de AOP do %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Retira o status de OP de um nick no canal"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Desprotege um determinado nick no canal"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Descrição do canal %s alterada para %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
+#, fuzzy
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Retira o status de Voice de um nick no canal"
+
+#: modules/core/ns_ghost.cpp:22
 #, fuzzy
-msgid "Disabled"
-msgstr "desativado"
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr ""
+"    GHOST      Termina uma sessão \"fantasma\" de IRC que esteja usando seu "
+"nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr ""
+"    STAFF       Exibe os membros da Staff dos Services e seu status online"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Exibidos todos os registros (Contador: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Exibidos registros de %d até %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Exibidos registros coincidindo com a chave %s (Contador: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Mostra informações sobre algum nick registrado"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO     Exibe informações sobre suas mensagens"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Exibe uma ou mais entradas de vHost"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO     Exibe informações sobre suas mensagens"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3317,169 +2759,208 @@ msgstr "Não use a palavra %s neste canal!"
 msgid "Don't use underlines on this channel!"
 msgstr "Não use sublinhados neste canal!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "E-mail para %s é inválido."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parâmetros]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "O nick %s usa o E-mail %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "ativado"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Fim da lista de %s."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Fim da lista de acesso."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Fim da listagem."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Fim da listagem."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Português"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Erro! O Ident é muito comprido, por favor use um Ident de até %d caracteres."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Erro! O host é muito comprido, por favor use um host de até %d caracteres."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Sessão para %s (#%d) alterada para a posição %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exceção para %s foi atualizada para %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "               Expira em: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Tempo de expiração para %s alterado."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID canal motivo"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID canal [motivo]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nick motivo"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [motivo]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantasia"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "Modo Fantasia está agora ATIVADO no canal %s."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "Modo Fantasia está agora ATIVADO no canal %s."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s não será mais ignorado."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "A máscara %s já se encontra em sua lista de acesso."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr "    UPDATE      Salva os dados atuais dos Services"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Força a mudança do nick de um usuário"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Esqueceu sua senha? Tente isto"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Founder do canal %s alterado para %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@emailhost Não use coringas!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY canal"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Comando GETPASS não disponível: modo de encriptação ativado."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [senha]"
 
@@ -3487,11 +2968,26 @@ msgstr "GHOST nick [senha]"
 msgid "GLOBAL message"
 msgstr "GLOBAL mensagem"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Seu nick foi derrubado e pode ser usado."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Dá flags de Operador a um determinado usuário"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Atribui status de OP a um nick no canal"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Concede-lhe status de Owner no canal"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Mensagem de entrada"
 
@@ -3499,78 +2995,156 @@ msgstr "Mensagem de entrada"
 msgid "Greet message displayed"
 msgstr "Mensagem de entrada"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr "Modo mensagem de entrada está agora ATIVADO no canal %s."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, fuzzy, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr "Modo mensagem de entrada está agora ATIVADO no canal %s."
+
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Atribui status de HalfOP a um nick no canal"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Esconde certas informações sobre seu nick"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       Esconde o canal do comando LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d registros, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Hosts com pelo menos %d sessões:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY senha"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [tempo] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO canal"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {canal | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE canal"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Identifica seu nick com sua senha"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Se você não mudar seu nick em 20 segundos, eu irei mudá-lo."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Se você não mudar seu nick em 1 minuto, eu irei mudá-lo."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Lista de Ignore foi apagada."
@@ -3579,12 +3153,13 @@ msgstr "Lista de Ignore foi apagada."
 msgid "Ignore list is empty."
 msgstr "Lista de Ignore dos Services vazia."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Lista de bots:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3600,25 +3175,17 @@ msgstr ""
 "Digite /msg %s HELP SET opção para maiores informações\n"
 "sobre um comando específico."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Informação sobre um módulo carregado"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Informações do bot %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Informações do canal %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Tempo de expiração inválido."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3626,14 +3193,11 @@ msgstr ""
 "Máscara inválida. Apenas máscaras (hosts) são válidas como exceções aos "
 "limites de sessões. Nick ou username não são válidos."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Um passcode inválido foi digitado, por favor verifique o e-mail e tente "
-"novamente"
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3642,7 +3206,7 @@ msgstr ""
 "Limite de sessão inválida. O limite deve ser um número inteiro maior ou "
 "igual a zero e menor que %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Número inválido. Deve ser um número inteiro maior que 1."
 
@@ -3650,12 +3214,17 @@ msgstr "Número inválido. Deve ser um número inteiro maior que 1."
 msgid "JUPE servername [reason]"
 msgstr "JUPE servidor [motivo]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Se junta a um grupo"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK canal opções {ON|OFF} [configurações]"
@@ -3664,262 +3233,447 @@ msgstr "KICK canal opções {ON|OFF} [configurações]"
 msgid "KICK channel user reason"
 msgstr "KICK canal usuário motivo"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Kicka um usuário de um canal"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicka (expulsa) um nick de um canal"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Derruba usuário que esteja usando seu nick"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS canal {SET | DIS[ABLE] | LIST | RESET} [item [nível]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST opções"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST opções [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [canal] [list | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP alvo senha"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Linguagem alterada para Português."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Último memo enviado para %s foi cancelado."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Última mensagem de saída: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "   Último endereço visto: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Nível para %s no canal %s alterado para %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "O nível deve ser entre %d e %d inclusive."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Este comando não tem utilidade neste modo."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Lista de entradas com %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       Lista todos os nicks registrados que combinam com o padrão "
+"fornecido"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      Lista todos os canais nos quais você tem acesso"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Lista os módulos carregados"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicks no grupo %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicks no grupo:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST     Lista suas mensagens"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Lista todos os canais em uso na Rede"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Lista de nicks no grupo:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lista todos os canais registrados que combinam com o padrão "
+"fornecido"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Lista todos os usuários online na Rede"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "    BOTLIST            Lista os bots disponíveis"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Mostra informações sobre algum canal registrado"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Carrega um módulo"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Canais locais não podem ser registrados."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
+#, c-format
+msgid "Logon news item #%d deleted."
+msgstr "Logon news removido #%d."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Logon news não encontrado #%d!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Logon News itens:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE canal modos"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO NomeDoArquivo"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD NomeDoArquivo"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD NomeDoArquivo"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD NomeDoArquivo"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "    BADWORDS           Configura os palavrões"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "    BOT                Mantém a lista de bots da Rede"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Modifica a lista de HOP (HalfOP) de um canal"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Modifica a lista de VOP (VOicePeople) de um canal"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"    ACT                Faz com que o bot faça o mesmo que o comando \"/me\""
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"    SAY                Faz com que o bot diga determinado texto no canal dado"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Manipula a lista de AKILL"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipula o sistema DefCon"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Manipula a lista de SNLINE"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Manipula a lista de SQLINE"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Manipula a lista de SZLINE"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Modifica o tópico de um canal"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "A máscara %s já se encontra em sua lista de acesso."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "A máscara deve ser no formato user@host."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Encontra e retorna todos os usuários que se\n"
+"                   registraram usando o email fornecido"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Máximo atingido: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "Memo %d de %s (%s). Para apagar, digite: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr "Memo %d de %s (%s). Para apagar, digite: /msg %s DEL %s %d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Memo %d foi apagado."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Limite de memos desativado para %s."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Limite de memos para %s é agora de %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de memos para %s é agora de 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Limite de memos muito grande; limitando em %d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado para %s."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "Memos para %s. Para ler, digite: /msg %s READ núm"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "Memos para %s. Para ler, digite: /msg %s READ %s núm"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "Memos para %s. Para ler, digite: /msg %s READ núm"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "Memos para %s. Para ler, digite: /msg %s READ %s núm"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Modo mensagem"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "        Trava de modo: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Modifica a lista de AOP (AutoOP) de um canal"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Modifica a lista de SOP (SuperOP) de um canal"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Modifica a lista de endereços autorizados"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Modifica a lista de usuários privilegiados"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Modifica a lista de limite de sessões"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Módulo %s carregado"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Módulo %s carregado"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Módulo %s descarregado"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Módulo: %s Versão: %s Autor: %s Carregado: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Módulo: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} servidor"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "Nicks NS      : %6d registros, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "Grupos NS     : %6d registros, %5d kB"
@@ -3932,11 +3686,13 @@ msgstr "Nunca ser kickado pelos motivos dos Kickers do bot"
 msgid "New memo"
 msgstr "Novo memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "Novos memos para %s. Para ler, digite: /msg %s READ núm"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "Novos memos para %s. Para ler, digite: /msg %s READ %s núm"
 
@@ -3944,141 +3700,107 @@ msgstr "Novos memos para %s. Para ler, digite: /msg %s READ %s núm"
 msgid "News list is full!"
 msgstr "Lista de logon news está cheia!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Nick %s foi bloqueado por %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "O nick %s foi desregistrado."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "O nick %s já está registrado!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s é um nick ilegal e não pode ser usado."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s está atualmente em uso."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Nick %s está agora bloqueado."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s é parte dos Services desta Rede."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Nick %s não está em uso no momento."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Nick %s não está sendo usado."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Nick %s não está registrado."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Nick %s não pode ser registrado ou usado."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s não encontrado na lista de Ignore."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s foi truncado para %d caracteres."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "O nick %s não possui nenhum memo seu."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "O nick %s foi desconectado."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s está atualmente suspenso."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s foi liberado."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s foi suspendido."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NÃO registrado, por favor tente novamente mais tarde."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nick %s confirmado"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "O nick %s foi desregistrado."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "O nick %s já está registrado!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "O nick %s não pode ser registrado."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "O nick %s foi registrado em sua conta: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nick %s registrado."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Registro de nick (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4089,26 +3811,36 @@ msgstr ""
 "a expirarem automaticamente, ou seja, eles serão apagados\n"
 "após %d dias sem serem usados."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Modo NOBOT está agora ATIVADO no canal %s."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Modo NOBOT está agora ATIVADO no canal %s."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Nenhum email listado para %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Sem bot"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "não expira"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Nenhuma ajuda disponível para %s."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Nenhuma informação sobre o módulo %s está disponível."
@@ -4123,13 +3855,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Resultado não encontrado na lista de AOP do %s."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Resultado não encontrado na lista de acesso do %s."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Nenhum resultado encontrado na lista de akick do %s."
@@ -4140,39 +3872,43 @@ msgstr "Nenhum resultado encontrado na lista de akick do %s."
 msgid "No matching entries on %s bad words list."
 msgstr "Nenhum resultado correspondente encontrado na lista do %s."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "Nenhum resultado encontrado na lista de limite de sessões."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Nenhum resultado equivalente na lista de AKILL."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Nenhum resultado equivalente na lista de SNLINE."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Nenhum resultado equivalente na lista de SQLINE."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Nenhum resultado equivalente na lista de SZLINE."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Nenhum memo foi cancelado."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Nenhum módulo carregado atualmente."
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Nenhum OperNews para remover!"
@@ -4181,16 +3917,12 @@ msgstr "Nenhum OperNews para remover!"
 msgid "No random news items to delete!"
 msgstr "Nenhum item RandomNews para deletar!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Sem motivo"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Sem assinatura no kick quando a opção SIGNKICK LEVEL estiver em uso"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "Nenhuma"
 
@@ -4198,7 +3930,7 @@ msgstr "Nenhuma"
 msgid "Not allowed to join channel"
 msgstr "Entrada no canal não permitida"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4210,28 +3942,28 @@ msgstr ""
 "desse canal entrar neste período de tempo) terá\n"
 "automaticamente cancelado o seu registro."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Núm  Limite  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "Op-notice"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4240,13 +3972,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "A informação antiga é igual a nova."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Nível Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "Opção Op-notice para %s está agora ATIVADA."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "Opção Op-notice para %s está agora ATIVADA."
 
 #: modules/core/os_news.cpp:55
@@ -4255,131 +3992,95 @@ msgid "Oper news item #%d deleted."
 msgstr "OperNews removido #%d."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "OperNews não encontrado #%d!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Oper News itens:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ      : %6d registros, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "As Operflags %s foram adicionadas para %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Proteção de OPs"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Opção %s não pode ser usada nesta Rede."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Passcode para %s é %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Senha aceita - você está agora reconhecido."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Identificação de senha requerida para usar este comando.\n"
-"Tente novamente após digitar /msg %s IDENTIFY senha."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Senha incorreta."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Senha para %s é %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Senha incorreta."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Senha para %s foi enviada."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Paz"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Opção Peace para %s está agora ATIVADA."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Opção Peace para %s está agora ATIVADA."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr ""
-"Por favor contacte algum Operator para receber um vhost associado a este "
-"nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Por favor tente novamente com uma senha mais difícil. Não use TAB ou espaços."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Por favor, use um nome de servidor válido quando estiver \"jupando\"."
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Por favor use o símbolo # quando tentar registrar"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Por favor aguarde %d segundos e tente novamente."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Por favor espere %d segundos antes de usar o comando GROUP novamente."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -4395,63 +4096,122 @@ msgstr "Por favor aguarde %d segundos antes de usar o comando RSEND novamente."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Previne um canal de ser registrado/usado"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Previne um canal de ser registrado/usado,\n"
+"               preservando os dados do canal e suas configurações"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Previne um nick de ser usado ou registrado"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Privado"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
+#, fuzzy, c-format
+msgid "Private mode of bot %s is now off."
+msgstr "Modo Privado do bot %s está agora ATIVADO."
+
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now on."
 msgstr "Modo Privado do bot %s está agora ATIVADO."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/cs_set_private.cpp:38
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private option for %s is now off."
 msgstr "Opção Private para %s está agora ATIVADA."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option for %s is now on."
+msgstr "Opção Private para %s está agora ATIVADA."
+
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Proteção"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
+#, fuzzy, c-format
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protege um determinado nick no canal"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Comando fornecido: //msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [canal] {list | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [senha]"
 
@@ -4459,15 +4219,15 @@ msgstr "RECOVER nick [senha]"
 msgid "REGISTER channel description"
 msgstr "REGISTER canal descrição"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [senha]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | canal} mensagem"
 
@@ -4477,290 +4237,363 @@ msgid "Random news item #%d deleted."
 msgstr "RandomNews item #%d deletado."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "RandomNews item #%d não encontrado!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Random News itens:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ     Lê a(s) mensagem(ns)"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Redefine os níveis de acesso"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
+msgstr "    RELEASE    Retoma a custódia do seu nick após um RECOVER"
+
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Registra um nick"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Registra um nick"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         Regula o uso de comandos críticos"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Libera um canal suspenso"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Carrega um módulo"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
 msgstr ""
-"O primeiro passo do registro deve ter expirado, por favor use /msg %s "
-"register <senha> <email> primeiro."
+"    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Retira seu status de Owner no canal"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Acesso restrito ao canal"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Acesso restrito"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Opção de acesso restrito para %s está agora ATIVADA."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Opção de acesso restrito para %s está agora ATIVADA."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     Mantem o tópico quando o canal não está em uso"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr "    GETPASS    Recupera a senha de um determinado nick"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Fornece o atual nível de acesso de um usuário em um canal"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Retorna a key (do modo +k) do canal fornecido"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Retorna o status do owner de um determinado nick"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverte o efeito do comando IDENTIFY"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY canal texto"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | canal} texto"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Comando SENDPASS não disponível: modo de encriptação ativado."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limite"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET canal opções configurações"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET canal NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET canal PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET canal opções parâmetros"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET canal DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET canal DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET canal FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET canal GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET canal KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET canal NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET canal OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET canal PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET canal PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET canal RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET canal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET canal SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET canal SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET canal SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET canal TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET opções parâmetros"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET opção configuração"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE número"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [canal] limite"
 
@@ -4768,7 +4601,7 @@ msgstr "SET LIMIT [canal] limite"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [usuário | canal] {limite | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4776,24 +4609,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "A lista de SNLINE está vazia."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4801,16 +4634,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista}[:"
 "motivo]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "A lista de SQLINE está vazia."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4819,54 +4652,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} "
 "[motivo]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Senha aceita - você está agora reconhecido."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Senha aceita - você está agora reconhecido."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s não está online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND canal motivo"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND canal motivo"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nick motivo"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick novonick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "A lista de SZLINE está vazia."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4875,66 +4718,121 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+tempo] {máscara | lista} "
 "[motivo]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Salva os dados e reinicia os Services"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Seguro"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Founder Seguro"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "OPs Seguros"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now off."
 msgstr "Opção Secure Founder para %s está agora ATIVADA."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure founder option for %s is now on."
+msgstr "Opção Secure Founder para %s está agora ATIVADA."
+
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
 msgstr "Opção Secure OPs para %s está agora ATIVADA."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
+msgstr "Opção Secure OPs para %s está agora ATIVADA."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
 msgstr "Opção Secure para %s está agora ATIVADA."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
+#, fuzzy, c-format
+msgid "Secure option for %s is now on."
+msgstr "Opção Secure para %s está agora ATIVADA."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_set_secure.cpp:36
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Segurança"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND     Envia uma mensagem para um nick ou para um canal"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF    Envia um memo para todos os opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Envia um memo para todos os usuários registrados"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Envia uma mensagem para todos usuários"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      Envia uma notice quando os comandos OP/DEOP são usados"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND    Envia um memo e pede uma confirmação de leitura"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Este serviço está temporariamente desabilitado, por favor tente novamente "
 "mais tarde"
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services estão agora em DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Services estão agora no modo expira."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Services estão agora no modo não expira."
 
@@ -4946,7 +4844,7 @@ msgstr "Services estão agora no modo somente leitura."
 msgid "Services are now in read-write mode."
 msgstr "Services estão agora no modo leitura e gravação."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Services estão agora no modo debug (nível %d)."
@@ -4959,7 +4857,7 @@ msgstr "Services estão agora no modo debug."
 msgid "Services are now in non-debug mode."
 msgstr "Services não estão mais no modo debug."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Os services foram configurados para não enviar e-mail."
 
@@ -4969,7 +4867,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -4978,152 +4876,191 @@ msgstr ""
 "Os Services não conseguiram alterar os modos. As U:lines dos seus servidores "
 "estão configuradas corretamente?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Services ativos %d dias, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Services ativos %d horas, %d minutos"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Services ativos %d minutos, %d segundos"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Arquivos de configuração dos Services foram recarregados."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Seu nick foi derrubado e pode ser usado."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Limite de sessões para %s é agora de %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Opção de limite de sessões desabilitada."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Sessões       : %6d registros, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessões  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Ajusta as opções e informações do canal"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       Ajusta como os Services devem fazer o ban"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET      Ajusta opções relacionadas às mensagens"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Ajusta opções, incluindo proteção de kill"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Ajusta a descrição do canal"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Mostra o seu grupo nos Services"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Ajusta o fundador do canal"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Ajusta a linguagem dos Services quando\n"
+"                   mensagens são enviadas à você"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Ajusta o sucessor do canal"
+
+#: modules/core/hs_setall.cpp:21
 #, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Ajusta o vHost de todos os nicks de um grupo"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Ajusta o vHost de outro usuário"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Configura várias opções globais dos Services"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Ajusta a senha do seu nick"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Level %s desconhecido. Digite /msg %s HELP LEVELS DESC para uma lista de "
 "Levels válidos."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "Configuração do DEBUG deve ser ON, OFF, ou um número positivo."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "Opção NOEXPIRE deve ser ON ou OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "Configuração do READONLY deve ser ON ou OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 "Configuração de SuperAdmin deve ser ON ou OFF (deve estar habilitada no "
 "services.conf)."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Opção Signed Kicks para %s está agora ATIVADA."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Mostra estatísticas dos Services e da Rede"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      Assinatura dos kicks feitos pelo comando KICK"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5132,27 +5069,33 @@ msgstr ""
 "Opção Signed Kicks para %s está agora ATIVADA, mas depende\n"
 "do nível de acesso do usuário que está usando o comando."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Opção Signed Kicks para %s está agora ATIVADA."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Opção Signed Kicks para %s está agora ATIVADA."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Kicks assinados"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Desculpe, RSEND foi desabilitado nesta rede."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Desculpe, mas o comando ASSIGN está temporariamente desativado."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Desculpe, criação do bot falhou."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Desculpe, comando CHANGE temporariamente desativado."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Desculpe, o comando SET está temporariamente desativado."
 
@@ -5163,7 +5106,7 @@ msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Desculpe, a modificação da lista de AOP está temporariamente desabilitada."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Desculpe, o registro de canais está temporariamente desativado."
 
@@ -5171,64 +5114,43 @@ msgstr "Desculpe, o registro de canais está temporariamente desativado."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Desculpe, o comando AKICK está temporariamente desativado."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Desculpe, o comando BADWORDS está temporariamente desatvado."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Desculpe, o comando DROP está temporariamente desativado."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Desculpe, o comando SET está temporariamente desativado."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Desculpe, o registro de canais está temporariamente desativado."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Desculpe, a identificação falhou."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Desculpe, as configurações do kicker estão temporariamente desativadas."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Desculpe, a opção SET está temporariamente desativada."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Desculpe, o envio de memos está temporariamente desabilitado."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Desculpe, o comando DROP está temporariamente desativado."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Desculpe, o comando GROUP está temporariamente desativado."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Desculpe, a opção SET está temporariamente desativada."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Desculpe, registros de nick estão temporariamente desativados."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Desculpe, registro de nick falhou."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5240,13 +5162,13 @@ msgstr ""
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Desculpe, você pode ter somente %d entradas em sua lista de acesso."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr ""
 "Desculpe, você pode ter apenas %d entradas na lista de acesso do canal."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Desculpe, você pode ter apenas %d akicks na lista do canal."
@@ -5256,21 +5178,16 @@ msgstr "Desculpe, você pode ter apenas %d akicks na lista do canal."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Desculpe, você pode ter apenas %d palavrões em sua lista."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Desculpe, você já ultrapassou o limite de %d canais registrados."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "Desculpe, você já alcançou o limite de %d canais registrados."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Desculpe, você pode ter somente %d entradas em sua lista de acesso."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Resetar estatísticas."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status atualizado (memos, vhost, chmodes, flags)."
 
@@ -5282,12 +5199,22 @@ msgstr "Pare de floodar!"
 msgid "Stop repeating yourself!"
 msgstr "Pare de ficar repetindo!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER Controle rigoroso do status de Fundador do Canal"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Controle rigoroso do status de OP"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Successor do canal %s removido."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Successor do canal %s alterado para %s."
@@ -5296,21 +5223,37 @@ msgstr "Successor do canal %s alterado para %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Opção SuperAdmin não habilitada no arquivo services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspende o nick fornecido"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Simbiose"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Modo SYMBIOSIS está agora ATIVADO no canal %s."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Modo SYMBIOSIS está agora ATIVADO no canal %s."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr ""
+"    GROUP       Sincroniza um mesmo vHost para todos os nicks de um grupo"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Sintaxe: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5337,7 +5280,7 @@ msgstr ""
 "2: ban na forma *!*@host\n"
 "3: ban na forma *!*user@*.domain"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5350,7 +5293,7 @@ msgstr ""
 "Ajusta a descrição para o canal, que são mostradas com\n"
 "os comandos LIST e INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5363,7 +5306,7 @@ msgstr ""
 "Muda o fundador do canal. O novo nick deve estar\n"
 "registrado."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5382,7 +5325,7 @@ msgstr ""
 "mesmo depois que os usuários deixarem o canal, e será\n"
 "restaurado na próxima vez que o canal for reutilizado."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5399,7 +5342,7 @@ msgstr ""
 "o canal sempre que os comandos OP ou DEOP forem usados em um\n"
 "usuário no canal."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5416,7 +5359,7 @@ msgstr ""
 "banir ou remover os modos no canal de um usuário que tenha\n"
 "nível superior ou igual ao seu via comandos do %s."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5461,7 +5404,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5475,7 +5419,7 @@ msgstr ""
 "private está ativada, um /msg %s LIST não irá incluir\n"
 "o canal em qualquer listagem."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5490,7 +5434,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5509,7 +5453,7 @@ msgstr ""
 "e identificados com sua senha poderão entrar no canal\n"
 "controlado pela lista de acesso."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5527,7 +5471,7 @@ msgstr ""
 "poderá dar DROP no canal, mudar sua senha, seu founder e seu\n"
 "successor, e não aqueles que estiverem identificados no %s."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5549,7 +5493,24 @@ msgstr ""
 "(%d), o canal será dropado, como se nenhum sucessor tivesse\n"
 "sido ajustado. O novo nick deverá estar registrado."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Sintaxe: %s canal TOPICLOCK {ON|OFF}\n"
+"\n"
+"Ativa ou desativa a opção de trava do tópico de um canal.\n"
+"Quando a trava do tópico está ativada, o %s não\n"
+"permitirá a mudança do tópico do canal exceto pelo comando \n"
+"TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5594,8 +5555,8 @@ msgstr ""
 "Entretanto, mudar do sistema de listas xOP para sistema de lista\n"
 "de acesso não causa problemas."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5685,7 +5646,7 @@ msgstr ""
 "O comando ACCESS CLEAR limpa todas as entradas da lista\n"
 "de acesso."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5733,7 +5694,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra a lista de acesso atual."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5745,7 +5706,7 @@ msgstr ""
 "Faz com que o bot faça o mesmo que o comando \"/me\"\n"
 "em um determinado canal com o determinado texto."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5765,7 +5726,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5789,7 +5750,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5846,7 +5807,7 @@ msgstr ""
 "O comando AKICK CLEAR limpa todas as entradas da lista\n"
 "de AutoKick."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5937,7 +5898,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR apaga todas as entradas da lista de AKILL."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5976,7 +5937,7 @@ msgstr ""
 "\n"
 "Canais com a opção NOEXPIRE serão prefixados por uma exclamação."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -5995,7 +5956,7 @@ msgstr ""
 "\n"
 "Este uso é limitado aos Administradores dos Services."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6025,17 +5986,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxe: AOP canal ADD nick\n"
 "         AOP canal DEL {nick | entrada | lista-entradas}\n"
@@ -6076,7 +6026,7 @@ msgstr ""
 "de acesso, e /msg %s HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6090,8 +6040,8 @@ msgstr ""
 "Você poderá então configurar o bot para o canal de acordo\n"
 "com as suas necessidades."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6112,20 +6062,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Sintaxe: BADWORDS canal ADD palavra [SINGLE | START | END]\n"
 "         BADWORDS canal DEL {palavra | núm-entrada | lista}\n"
@@ -6165,7 +6101,7 @@ msgstr ""
 "\n"
 "O comando BADWORDS CLEAR limpa todas entradas da lista."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6181,7 +6117,7 @@ msgstr ""
 "Por padrão, limitado a AOPs ou àqueles com nível de acesso 5 ou\n"
 "superior no canal."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6222,7 +6158,7 @@ msgstr ""
 "seja registrado. Se um usuário não registrado está atualmente\n"
 "usando o nick, ele será killado."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6232,7 +6168,7 @@ msgstr ""
 "\n"
 "Lista todos os bots disponíveis nesta Rede."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6245,7 +6181,21 @@ msgstr ""
 "canal, caso ela ainda não tenha sido lida no momento em que este\n"
 "comando for usado."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6257,7 +6207,7 @@ msgstr ""
 "usa por completo todo o host real ident@host para cada nick;\n"
 "em seguida, força o AKILL."
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6277,7 +6227,7 @@ msgstr ""
 "estiver usando. Se SECRET é especificado, listará apenas canais\n"
 "combinando com o padrão e que tenham modo +s ou +p."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6290,7 +6240,7 @@ msgstr ""
 "foi lido ou não. Observe que isso só funciona com nicks,\n"
 "nunca com canais."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6305,7 +6255,7 @@ msgstr ""
 "\n"
 "Limitado àqueles que possuem acesso de Founder no canal."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6315,16 +6265,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6341,7 +6304,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6353,7 +6316,7 @@ msgstr ""
 "pré-definido de restrições aos Services, útil durante uma\n"
 "tentativa de ataque à Rede."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6377,7 +6340,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 4 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6386,7 +6349,7 @@ msgstr ""
 "Sintaxe: DEL <nick>\n"
 "Deleta o vhost associado ao nick dado."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6422,7 +6385,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      Apaga mensagens numeradas de 2 a 5 e de 7 a 9."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6433,7 +6396,7 @@ msgstr ""
 "Deleta o vhost para todos os nicks no mesmo grupo do\n"
 "nick fornecido."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6454,7 +6417,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6474,7 +6437,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6493,7 +6456,7 @@ msgstr ""
 "Por padrão, limitado ao Founder, a SOPs ou àqueles com nível\n"
 "10 ou superior no canal para se auto-desprotegerem."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6517,7 +6480,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 3 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6529,7 +6492,7 @@ msgstr ""
 "Cancela o registro do canal. So poderá ser usado pelo\n"
 "fundador do canal."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6541,8 +6504,8 @@ msgstr ""
 "Cancela o registro de um canal. Somente Administradores dos\n"
 "Services podem cancelar canais que pertencem a outros usuários."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6572,7 +6535,7 @@ msgstr ""
 "você se identifique usando sua senha (/msg %s HELP IDENTIFY \n"
 "para maiores informações)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6595,7 +6558,7 @@ msgstr ""
 "SEU GRUPO sem nenhum privilégio especial, mas desregistrar\n"
 "QUALQUER nick é restrito aos Administradores dos Services."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6678,7 +6641,7 @@ msgstr ""
 "irão degradar a eficácia de funcionamento (\"performance\")\n"
 "dos services."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6694,7 +6657,7 @@ msgstr ""
 "\n"
 "Um motivo pode ser necessário em algumas redes."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6710,7 +6673,7 @@ msgstr ""
 "\n"
 "Em algumas redes, um motivo é necessário."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6725,7 +6688,7 @@ msgstr ""
 "Sempre que este comando for usado, uma mensagem incluindo a pessoa\n"
 "que emitiu o comando e o email no qual foi usado serão gravados."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6735,7 +6698,7 @@ msgstr ""
 "\n"
 "Retorna a key (do modo +k) de um determinado canal."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6754,7 +6717,7 @@ msgstr ""
 "\n"
 "Este comando não fica disponível quando a encriptação está habilitada."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6785,7 +6748,7 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6795,7 +6758,7 @@ msgstr ""
 "\n"
 "Lista todos os nicks do grupo."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6826,7 +6789,7 @@ msgstr ""
 "Permite que os IRCops enviem mensagens para todos os usuários\n"
 "da Rede. A mensagem será enviada pelo nick %s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6839,7 +6802,8 @@ msgstr ""
 "Este comando permite aos usuários ajustar o vhost do seu\n"
 "nick ATUAL para ser o vhost de todos os nicks no mesmo grupo."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6903,7 +6867,7 @@ msgstr ""
 "\n"
 "Atenção: todos os nicks do grupo terão a mesma senha."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6926,7 +6890,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 4 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -6955,16 +6919,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxe: HOP canal ADD nick\n"
 "         HOP canal DEL {nick | entrada | lista-entradas}\n"
@@ -7002,7 +6956,7 @@ msgstr ""
 "de acesso, e /msg %s HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7020,7 +6974,7 @@ msgstr ""
 "comando antes de você usá-los. A senha deve ser a mesma que\n"
 "você enviou com o comando REGISTER."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7030,7 +6984,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7063,7 +7017,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7084,7 +7038,7 @@ msgstr ""
 "informações sobre a mensagem de entrada e sobre o sucessor\n"
 "do canal também serão mostradas."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7100,7 +7054,7 @@ msgstr ""
 "e a opção ALL é especificada, será mostrado a você toda\n"
 "informação possível; independente de haver opções para esconder."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7116,7 +7070,7 @@ msgstr ""
 "você pode receber. Com o parâmetro, mostra a mesma\n"
 "informação para o canal fornecido."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7143,7 +7097,7 @@ msgstr ""
 "o nick fornecido. Esta derivação do comando é limitada aos\n"
 "Administradores dos Services."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7162,7 +7116,7 @@ msgstr ""
 "você terá informações sobre o bot, como o horário de criação\n"
 "ou número de canais onde ele está."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7203,7 +7157,7 @@ msgstr ""
 "o texto \"Jupado por <nick>\", mostrando o nick de quem mascarou\n"
 "o servidor."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7218,7 +7172,8 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7245,7 +7200,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7267,8 +7222,8 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7333,7 +7288,7 @@ msgstr ""
 "\n"
 "*** Spam foi kickado do canal #canal pelo %s (Operador (Flood))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7351,7 +7306,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7369,7 +7324,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7398,7 +7353,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7416,7 +7371,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7440,7 +7395,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7456,7 +7411,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7474,7 +7429,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7492,7 +7447,7 @@ msgstr ""
 "antes de ser banido. Não forneça ttb para desabilitar\n"
 "o sistema de ban que foi uma vez ativado."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7545,7 +7500,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7569,7 +7524,7 @@ msgstr ""
 "A lista usa o valor de NSListMax como limite do número de\n"
 "itens para exibir a um Operator de uma vez só."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7583,7 +7538,7 @@ msgstr ""
 "Lista todos os canais registrados que combinam com o padrão\n"
 "fornecido. (Canais com opção PRIVATE ativada não serão listados)."
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7623,7 +7578,7 @@ msgstr ""
 "        Lista todos os nicks possuídos por usuários do domínio\n"
 "        bar.org"
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7681,7 +7636,7 @@ msgstr ""
 "        Lista todos os nicks registrados cujos registros foram\n"
 "        ajustados para não expirar."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7703,11 +7658,21 @@ msgstr ""
 "LIST 2-5,7-9\n"
 "   Lista mensagens numeradas de 2 a 5 e de 7 a 9."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "LOGONNEWS ADD texto"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7740,7 +7705,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "LOGONNEWS DEL {núm | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7756,7 +7721,7 @@ msgstr ""
 "dono do nick. Note, entretanto, que ele não pedirá que você se\n"
 "identifique novamente."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7782,22 +7747,7 @@ msgstr ""
 "\n"
 "Comando limitado aos Administradores dos Services."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintaxe: MODE canal modos\n"
-"\n"
-"Permite que os Operadores dos Services ajustem os modos de\n"
-"qualquer canal. Os parâmetros são os mesmos do comando\n"
-"/MODE padrão."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7824,7 +7774,22 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Sintaxe: MODE canal modos\n"
+"\n"
+"Permite que os Operadores dos Services ajustem os modos de\n"
+"qualquer canal. Os parâmetros são os mesmos do comando\n"
+"/MODE padrão."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7834,7 +7799,7 @@ msgstr ""
 "\n"
 "Este comando lista informações sobre um módulo carregado."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7844,7 +7809,7 @@ msgstr ""
 "\n"
 "Lista todos os módulos atualmente carregados."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7856,7 +7821,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7868,7 +7833,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7879,7 +7844,7 @@ msgstr ""
 "Este comando descarrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7906,7 +7871,7 @@ msgstr ""
 "Nota: O servidor não é checado como um todo\n"
 "pelos Services."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7918,7 +7883,7 @@ msgstr ""
 "Quando você usa este comando, qualquer usuário que faça um /whois\n"
 "em você irá ver seu endereço IP real/encriptado."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -7933,7 +7898,7 @@ msgstr ""
 "\"-\". Para remover todas as flags apenas digite um \"-\" em\n"
 "vez de usar alguma flag."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -7945,7 +7910,7 @@ msgstr ""
 "Quando você usa este comando, qualquer usuário que faça um /whois\n"
 "em você irá ver o vhost em vez do seu endereço IP real/encriptado."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -7970,7 +7935,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "OPERNEWS ADD texto"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, fuzzy, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8003,7 +7968,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "OPERNEWS DEL {núm | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8023,7 +7988,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8043,7 +8008,7 @@ msgstr ""
 "Por padrão, limitado ao Founder, a SOPs ou àqueles com nível\n"
 "10 ou superior no canal para se auto-protegerem."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8072,16 +8037,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8120,7 +8075,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8142,7 +8097,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "RANDOMNEWS ADD texto"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8168,7 +8123,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "RANDOMNEWS DEL {núm | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8193,7 +8148,8 @@ msgstr ""
 "READ 2-5,7-9\n"
 "   Mostra as mensagens numeradas de 2 a 5 e de 7 a 9."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8239,8 +8195,8 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8282,8 +8238,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8350,7 +8306,7 @@ msgstr ""
 "privilégios em canais. Para maiores informações neste recurso,\n"
 "digite /msg %s HELP GROUP."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8378,7 +8334,7 @@ msgstr ""
 "do nick, você deve estar identificado e estar no grupo daquele\n"
 "nick, ou você deve fornecer a senha correta para o nick."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8392,7 +8348,7 @@ msgstr ""
 "Repare que, para algumas mudanças terem efeito, será necessário\n"
 "que os Services sejam reiniciados."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8404,7 +8360,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8427,7 +8383,7 @@ msgstr ""
 "Salva o banco de dados dos Services e os reinicia.\n"
 "(sai e roda imediatamente o executável)."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8450,7 +8406,7 @@ msgstr ""
 "automática será enviada ao remetente informando-o que o memo\n"
 "foi lido."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8461,7 +8417,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8476,7 +8432,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8488,7 +8444,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8498,7 +8454,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8514,7 +8470,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8537,7 +8493,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8570,24 +8526,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8601,7 +8540,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8613,7 +8552,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8624,7 +8563,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8643,7 +8582,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8666,7 +8605,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8676,7 +8615,7 @@ msgstr ""
 "\n"
 "Faz com que o bot diga determinado texto no canal dado."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8693,7 +8632,7 @@ msgstr ""
 "receberá um aviso que possui uma nova mensagem. O nick/canal\n"
 "de destino deverá estar registrado."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8705,7 +8644,7 @@ msgstr ""
 "Envia um memo para todos os usuários registrados\n"
 "contendo uma mensagem."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8723,7 +8662,7 @@ msgstr ""
 "\n"
 "Poder ser limitado a Operadores de IRC em algumas redes."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8759,7 +8698,7 @@ msgstr ""
 "o limite de conexões e como especificar limites de conexões\n"
 "para certos hosts e grupos de hosts."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8773,7 +8712,7 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> ajustará idents para\n"
 "usuários, assim como vhosts."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8788,8 +8727,8 @@ msgstr ""
 "Quando secure ops estiver ativada, os usuários que não\n"
 "estiverem na lista de acesso não poderão ter o status de OP."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8813,26 +8752,9 @@ msgstr ""
 "superior ao nível do SIGNKICK não terão o nick aparecendo no \n"
 "motivo. Veja /msg %s HELP LEVELS para maiores informações. "
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Sintaxe: %s canal TOPICLOCK {ON|OFF}\n"
-"\n"
-"Ativa ou desativa a opção de trava do tópico de um canal.\n"
-"Quando a trava do tópico está ativada, o %s não\n"
-"permitirá a mudança do tópico do canal exceto pelo comando \n"
-"TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8865,7 +8787,7 @@ msgstr ""
 "Aviso: o acesso a este comando é controlado pelo ajuste\n"
 "dos níveis de acesso do canal."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8876,7 +8798,7 @@ msgstr ""
 "Esta opção previne um bot de ser associado a um canal\n"
 "por usuários que não sejam Operadores de IRC."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8892,7 +8814,7 @@ msgstr ""
 "\n"
 "Opções disponíveis:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8906,7 +8828,7 @@ msgstr ""
 "Quando estiver ativado, os OPs não serão kickados pelo bot,\n"
 "mesmo se eles não se enquadram no nível de NOKICK."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -8920,7 +8842,7 @@ msgstr ""
 "Quando estiver ativado, os voices não serão kickados pelo bot,\n"
 "mesmo se eles não se enquadram no nível de NOKICK."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -8953,7 +8875,7 @@ msgstr ""
 "do comando usado (por exemplo, para usar !op, o \n"
 "usuário deve ter acesso aos comandos OP e DEOP)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -8969,7 +8891,7 @@ msgstr ""
 "entrada dos usuários quando eles entrarem no\n"
 "canal, caso tenham nível de acesso suficiente."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -8984,7 +8906,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -8999,7 +8921,7 @@ msgstr ""
 "canal, este será automaticamente desassociado quando você\n"
 "ativar essa opção."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9012,7 +8934,7 @@ msgstr ""
 "Ajustando para ON, evita que o canal seja desregistrado\n"
 "por passar do tempo de expiração."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9030,8 +8952,8 @@ msgstr ""
 "mudanças de modos, kicks e, inclusive, a mensagem\n"
 "de entrada (entrymsg)."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9057,7 +8979,7 @@ msgstr ""
 "Digite /msg %s HELP SET opção, para mais informações sobre\n"
 "uma opção específica."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9067,7 +8989,7 @@ msgstr ""
 "\n"
 "Ajusta várias opções de nick. A opção pode ser:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9091,7 +9013,7 @@ msgstr ""
 "    IGNORE      Ativa ou desativa o modo Ignore\n"
 "    LIST        Lista as opções atuais"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9103,7 +9025,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9115,7 +9037,7 @@ msgstr ""
 "Altera o display usado como referência ao nome do seu grupo \n"
 "nos Services. O novo display DEVE ser um nick do seu grupo."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9133,7 +9055,7 @@ msgstr ""
 "nick ou o mesmo seje inválido, não será possível recuperar\n"
 "a senha perdida."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9148,7 +9070,7 @@ msgstr ""
 "de entrada que aparecerá sempre quando você entrar em um canal\n"
 "que tenha a opção GREET habilitada, e também tenha acesso a isto."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9171,7 +9093,7 @@ msgstr ""
 "O segundo parâmetro especifica quando a informação deve ser\n"
 "mostrada (OFF) ou escondida (ON)."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9204,7 +9126,7 @@ msgstr ""
 "não usar essa opção, a não ser que seja necessário. Pode\n"
 "acontecer do Administrador da Rede desabilitar essa opção."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9223,7 +9145,7 @@ msgstr ""
 "já que Inglês é a linguagem oficial destes Services.\n"
 "O número deve ser escolhido da seguinte lista de línguas:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9240,7 +9162,7 @@ msgstr ""
 "mensagens para você. Entretanto, você não pode ajustar este\n"
 "limite para mais que %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9282,7 +9204,7 @@ msgstr ""
 "podem ajustar o limite acima de %d, e não podem ajustar\n"
 "um limite máximo (HARD)."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9292,7 +9214,7 @@ msgstr ""
 "\n"
 "Exibe as várias configurações do %s."
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9306,7 +9228,7 @@ msgstr ""
 "comunicar com você. Com MSG acionado, os Services irão usar\n"
 "mensagems, caso contrário, usarão notices. "
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9325,7 +9247,7 @@ msgstr ""
 "Esta opção é equivalente à opção da linha de comando\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9362,7 +9284,7 @@ msgstr ""
 "\n"
 "ON é essencialmente a combinação de LOGON e NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9373,7 +9295,7 @@ msgstr ""
 "\n"
 "Muda a senha de seu nick."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9392,7 +9314,7 @@ msgstr ""
 "o comando %s's LIST. (Entretando, alguém que sabe do seu\n"
 "nick ainda pode obter informações usando o comando INFO)."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9423,7 +9345,7 @@ msgstr ""
 "Esta opção é equivalente à opção da linha de comando\n"
 "-readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9446,7 +9368,7 @@ msgstr ""
 "lista de acesso, o %s não irá dar auto-kill em você de\n"
 "acordo com os ajustes da opção KILL."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9461,7 +9383,7 @@ msgstr ""
 "Esta opção não é permanente, e deve ser usada somente quando\n"
 "necessária, e desativada quando não for mais necessária."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9480,7 +9402,7 @@ msgstr ""
 "* NOTA: isto não irá atualizar o vhost de nenhum nick\n"
 "adicionado ao grupo depois que o comando foi usado."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9490,7 +9412,7 @@ msgstr ""
 "\n"
 "Salva o banco de dados dos Services e os desliga."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9581,7 +9503,7 @@ msgstr ""
 "\n"
 "SNLINE CLEAR apaga todas as entradas da lista de SNLINE."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9611,16 +9533,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxe: SOP canal ADD nick\n"
 "         SOP canal DEL {nick | entrada | lista-entradas}\n"
@@ -9659,7 +9571,7 @@ msgstr ""
 "de acesso, e /msg %s HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9749,7 +9661,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR apaga todas as entradas da lista de SQLINE."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9759,7 +9671,7 @@ msgstr ""
 "Exibe todos os nicks da Staff dos Services juntamente com seus\n"
 "níveis e status on-line."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9771,7 +9683,7 @@ msgstr ""
 "Envia um memo a todos os membros da Staff dos Services\n"
 "contendo uma mensagem."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9817,7 +9729,7 @@ msgstr ""
 "A opção RESET reinicia a contagem do máximo de usuários\n"
 "para o número de usuários atualmente conectados na rede."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9841,7 +9753,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR mensagem-de-erro"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9885,7 +9797,7 @@ msgstr ""
 "Até 16 nicks podem ser enviados com cada comando; o resto será\n"
 "ignorado. Se nenhum nick for fornecido, seu status será exibido."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9903,7 +9815,7 @@ msgstr ""
 "\n"
 "Um motivo pode ser necessário em algumas redes."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -9913,7 +9825,7 @@ msgstr ""
 "\n"
 "Força a mudança do nick de um usuário, de nick a novo-nick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10001,7 +9913,8 @@ msgstr ""
 "\n"
 "SZLINE CLEAR apaga todas as entradas da lista de SZLINE."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10024,21 +9937,7 @@ msgstr ""
 "\n"
 "Por padrão, limitado àqueles que possuem acesso de Founder no canal."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Sintaxe: UMODE usuário modos\n"
-"\n"
-"Permite aos Services Operators ajustar os\n"
-"modos de usuário para qualquer usuário. Os parâmetros\n"
-"são os mesmos do comando /MODE padrão."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10056,7 +9955,7 @@ msgstr ""
 "sempre poder associá-lo àquele canal mais tarde sem ter que\n"
 "configurar tudo novamente."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10075,7 +9974,7 @@ msgstr ""
 "Por padrão, é limitado aos AOPs ou àqueles que possuem\n"
 "nível de acesso 5 ou superior no canal."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10093,7 +9992,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10105,7 +10004,7 @@ msgstr ""
 "Libera um canal suspenso. Todos os dados e configurações\n"
 "são preservados de antes da suspensão."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10117,7 +10016,7 @@ msgstr ""
 "Faz com que os Services atualizem o banco de dados logo que\n"
 "você envia este comando."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10140,7 +10039,7 @@ msgstr ""
 "estiver usando. Se INVISIBLE é especificado, listará apenas usuários\n"
 "que tenham o modo +i."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10164,7 +10063,7 @@ msgstr ""
 "àqueles que possuem nível de acesso 3 ou superior, para\n"
 "atribuírem o status a eles mesmos."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10193,16 +10092,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Sintaxe: VOP canal ADD nick\n"
 "         VOP canal DEL {nick | entrada | lista-entradas}\n"
@@ -10240,7 +10129,7 @@ msgstr ""
 "de acesso, e /msg %s HELP SET XOP para saber como\n"
 "escolher entre a lista de acesso e o sistema de listas xOP."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10256,7 +10145,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10264,7 +10153,7 @@ msgstr ""
 "Sintaxe: SUSPEND nick motivo\n"
 "SUSPENDE um nick, impedindo-o de ser usado."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10272,7 +10161,7 @@ msgstr ""
 "Sintaxe: UNSUSPEND nick\n"
 "LIBERA um nick suspendido, permitindo que seja usado."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10284,51 +10173,96 @@ msgstr ""
 "seta modos de canal necessários (ModeonID) e atualiza seu\n"
 "vHost e suas flags de usuário (Último horário visto etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC canal [tópico]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Diz ao ChanServ para remover certos ajustes de um canal"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Remove temporariamente todas as O:lines de um \n"
+"                  servidor remotamente"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Termina os Services salvando os dados"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Termina os Services sem salvar os dados"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "O comando IMMED não está disponível nesta Rede."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Lista de AKILL apagada."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "O Nível do Defcon está agora no Nível: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "A lista de SNLINE foi apagada."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "A lista de SQLINE foi apagada."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "A lista de SZLINE foi apagada."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "O canal %s não tem key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10339,90 +10273,80 @@ msgstr ""
 "Note que os níveis para AUTODEOP e NOJOIN são os níveis\n"
 "máximos, enquanto que todos os outros são níveis mínimos."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "O host %s possui atualmente %d sessões com um limite de %d."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "O último memo que você enviou para %s (enviado em %s) foi lido."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "O último memo que você enviou para %s (enviado em %s) ainda não foi lido."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "O limite de memos para %s não pode ser mudado."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "O novo display é agora %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "O nick %s está sendo alterado para %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "Existem %d memos para o canal %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10430,7 +10354,8 @@ msgstr ""
 "Não existem bots disponíveis no momento.\n"
 "Peça a um Administrador dos Services para criar mais bots!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10440,20 +10365,12 @@ msgstr ""
 "Digite /msg %s HELP GLIST e /msg %s HELP DROP para\n"
 "mais informações."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "Existe %d memo para o canal %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Foi recebido um novo memo para o canal %s.\n"
-"Digite /msg %s READ %s %d para ler."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Não possui mais nenhum bot associado ao canal %s."
@@ -10474,7 +10391,7 @@ msgstr "Não há RandomNews."
 msgid "There's no email address set for your nick."
 msgstr "Não há endereço de email ajustado para o seu nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10490,82 +10407,38 @@ msgstr ""
 "    PRIVATE          Previne um bot de ser associado por\n"
 "                       quem não é Operador de IRC."
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Este canal foi forbidado."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Este canal foi registrado com o %s."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Este canal foi suspenso."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Este canal não pode ser usado."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Este canal não irá expirar."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Esse nick já foi solicitado, por favor verifique seu e-mail pelo passcode"
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"Esse nick está aguardando um código de verificação por e-mail antes de "
-"completar o registro."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Este nick foi registrado por outra pessoa.  Por favor escolha outro.\n"
-"(Se este for seu nick, digite /msg %s IDENTIFY senha.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Este nick é registrado; você não pode usá-lo."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Este nick está atualmente suspenso"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Este nick está atualmente suspenso, motivo: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Este nick está registrado e protegido.  Se este for seu\n"
-"nick, digite /msg %s IDENTIFY senha.  Caso contrário,\n"
-"por favor escolha outro nick."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Este nick não irá expirar."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Este nick não pode ser usado.  Por favor escolha outro."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Este nick não irá expirar."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10573,30 +10446,60 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Altera o sistema de privilégio de usuário"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Trava de tópico"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Retenção de tópico"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     O tópico pode ser mudado apenas com o comando TOPIC"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Trava de tópico para %s está agora ATIVADA."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now on."
+msgstr "Trava de tópico para %s está agora ATIVADA."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Retenção de tópico para %s está agora ATIVADA."
+
+#: modules/core/cs_set_keeptopic.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now on."
 msgstr "Retenção de tópico para %s está agora ATIVADA."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Desligue o CAPS LOCK!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Ativa/Desativa a proteção de kill para o seu nick"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10611,7 +10514,8 @@ msgstr ""
 "    em um canal pode ler os memos do canal. Isso pode ser mudado\n"
 "    com o comando %s LEVELS."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10621,7 +10525,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname. "
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10629,7 +10534,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10637,130 +10543,130 @@ msgstr ""
 "Digite /msg %s HELP SET opção para maiores informações\n"
 "sobre uma opção em particular."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Digite /msg %s SET EMAIL e-mail para setar seu e-mail.\n"
-"Sua privacidade é respeitada; seu e-mail não será dado\n"
-"para terceiros."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Digite /msg %s LIST NEW para listar."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Digite /msg %s READ %d para ler."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Digite /msg %s READ LAST para ler."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modos"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Digite /msg %s SET EMAIL e-mail para setar seu e-mail.\n"
+"Sua privacidade é respeitada; seu e-mail não será dado\n"
+"para terceiros."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN canal"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN canal [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND canal"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nick"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Descarrega um módulo"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Impossível carregar o módulo %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Impossível remover o módulo %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "    UNASSIGN           Desassocia um bot de um canal"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Opção SET desconhecida: %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Opção STATS desconhecida: %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Comando desconhecido %s. Digite /msg %s HELP para ajuda."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Modo %c desconhecido e ignorado."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Opção desconhecida: %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Libera o nick fornecido"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Opção desconhecida: %s.\n"
-"Digite /msg %s HELP SET para maiores informações."
+"    UPDATE     Atualiza seu status atual, ou seja, verifica novos memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Atualizando banco de dados."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Usuários      : %6d registros, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"Usuário que usava seu nick foi derrubado.\n"
-"/msg %s RELEASE %s para liberar seu nick antes de %s."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "Usuário combina com Except do canal."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10768,16 +10674,35 @@ msgstr ""
 "Lista de usuários:\n"
 "Nick                 Máscara"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Founder do canal %s alterado para %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Mostra a lista de sessões de host"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Atribui status de Voice a um nick no canal"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Proteção de Voices"
 
@@ -10803,16 +10728,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Cuidado com suas palavras!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Você já é um membro do grupo %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Você já está identificado."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10821,11 +10746,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Você não é mais um Super-Admin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Você não tem permissão para permanecer neste canal."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Você não tem permissão para mudar seu limite de memos."
 
@@ -10833,53 +10754,55 @@ msgstr "Você não tem permissão para mudar seu limite de memos."
 msgid "You are now a SuperAdmin"
 msgstr "Você é agora um Super-Admin"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Você agora é um Operador de IRC."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
 msgstr "You are now identified for your nick "
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Você é agora um membro do grupo %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Você não pode pedir uma notificação ao enviar uma mensagem a si próprio."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Você não pode usar o comando GHOST em si mesmo!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr ""
 "Impossível fazer logout em %s porque ele é um Administrador dos Services."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Você não pode usar o comando RECOVER em si mesmo!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10889,7 +10812,8 @@ msgstr ""
 "Ao invés, use os comandos VOP, HOP, AOP e SOP.\n"
 "Digite /msg %s HELP comando para mais informação."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10900,6 +10824,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -10907,56 +10832,66 @@ msgstr ""
 "Você não pode usar este comando. Ao invés, use o comando ACCESS.\n"
 "Digite /msg %s HELP ACCESS para mais informação."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Você não pode colocar o limite de memos para %s maior que %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Você não pode colocar seu limite de memos maior que %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Você não pode remover o e-mail nesta Rede."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Você possui atualmente %d memos, dos quais %d não foram lidos."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Você possui atualmente %d memos, dos quais 1 não foi lido."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Você possui atualmente %d memos."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Você possui atualmente %d memos; dos quais nenhum foi lido."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Você possui atualmente 1 memo, e este ainda não foi lido."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Você possui atualmente 1 memo."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Você não possui nenhum memo atualmente."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -10966,63 +10901,44 @@ msgstr "Você tem %d novos memos."
 msgid "You have 1 new memo."
 msgstr "Você tem 1 novo memo."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Você recebeu um novo memo de %s.\n"
-"Digite /msg %s READ %d para ler."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Você não está mais banido do %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Você não possui limite de memos que pode guardar."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Você não possui memos."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Você não possui novos memos."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Você precisa digitar um número válido como tempo."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Você precisa primeiro associar um bot ao canal antes de usar este comando.\n"
-"Digite /msg %s HELP ASSIGN para maiores informações."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "Você deve ser no mínimo um operador para registrar o canal."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "Você deve ser no mínimo um operador para registrar o canal."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "Você deve estar conectado há mais de %d segundos para registrar seu nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11032,25 +10948,25 @@ msgstr ""
 "Este e-mail permitirá que você receba sua senha por ele\n"
 "caso você se esqueça dela."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Você será notificado de novos memos quando conectar e quando eles forem "
 "enviados."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Você será notificado de novos memos quando conectar."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Você será notificado de novos memos quando eles forem enviados."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Você não poderá mais receber memos."
 
@@ -11058,7 +10974,7 @@ msgstr "Você não poderá mais receber memos."
 msgid "You will no longer be informed via email."
 msgstr "Você não será mais notificado por email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Você será notificado de novos memos."
 
@@ -11066,18 +10982,20 @@ msgstr "Você será notificado de novos memos."
 msgid "You will now be informed about new memos via email."
 msgstr "Você será notificado sobre novos memos por email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Seu IRCD não suporta vIdent's, se isto não está certo, por favor reporte "
-"isso como um possível bug."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Sua lista de acesso está vazia."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Você já está identificado."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11093,35 +11011,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Sua lista de acesso está vazia."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Todas as O:lines do servidor %s foram removidas."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Lista de Ignore dos Services vazia."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Seu limite de memos foi desativado."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Seu limite de memo é agora de %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Seu limite de memos é de %d, e não pode ser alterado."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Seu limite de memos é de %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Seu limite de memos é de 0; você não pode receber novos memos."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11129,61 +11068,57 @@ msgstr ""
 "Seu limite de memos é de 0; você não pode receber novos memos. Você não pode "
 "alterar esse limite."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Seu nick foi desconectado."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Seu nick já está registrado; digite /msg %s DROP primeiro."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Seu nick não está registrado."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "O registro do seu nick foi cancelado."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Seu nick está sendo mudado para %s."
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Seu passcode foi re-enviado para %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Sua senha é %s - guarde ela para uso posterior."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Seu vhost %s está agora ativado."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Seu vhost %s@%s está agora ativado."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11202,94 +11137,95 @@ msgstr "[Oper News - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Random News - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "não expira"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "irá expirar na próxima atualização do banco de dados"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "expira em %d dia"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "expira em %d dias"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "expira em %d hora, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "expira em %d hora, %d minutos"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "expira em %d horas, %d minuto"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "expira em %d horas, %d minutos"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "expira em %d minuto"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "expira em %d minutos"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost para %s removido."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost de %s ajustado para %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost de %s ajustado para %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost do grupo %s ajustado para %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost do grupo %s ajustado para %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts do grupo %s foi removido."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Sistema de acesso xOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now off."
+msgstr "Sistema de acesso xOP para %s está agora ATIVADO."
+
+#: modules/core/cs_set_xop.cpp:71
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now on."
 msgstr "Sistema de acesso xOP para %s está agora ATIVADO."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11298,564 +11234,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canal} texto"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s adicionado à lista de AOP do %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s adicionado à lista de HOP do %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s adicionado à lista de SOP do %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s adicionado à lista de VOP do %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s deletado da lista de HOP do %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s deletado da lista de SOP do %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s deletado da lista de VOP do %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s movido para a lista de HOP do %s."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s movido para a lista de SOP do %s."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s movido para a lista de VOP do %s."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "Nick %s não encontrado na lista de HOP do %s."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "Nick %s não encontrado na lista de SOP do %s."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "Nick %s não encontrado na lista de VOP do %s."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr "    PRIVATE    Previne seu nick de aparecer em um /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d dias"
-
-#~ msgid "%d hours"
-#~ msgstr "%d horas"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minutos"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d segundos"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "Lista de HOP do canal %s está vazia."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "Lista de SOP do canal %s está vazia."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "Lista de VOP do canal %s está vazia."
-
-#~ msgid "1 day"
-#~ msgstr "1 dia"
-
-#~ msgid "1 hour"
-#~ msgstr "1 hora"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
-
-#~ msgid "1 second"
-#~ msgstr "1 segundo"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Permitido o uso do comando CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Permitido o uso dos comandos HALFOP/DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Lista de HOP do canal %s foi limpa."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Lista de SOP do canal %s foi limpa."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Lista de VOP do canal %s foi limpa."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "Deletadas %d entradas da lista de HOP do %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "Deletadas %d entradas da lista de SOP do %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "Deletadas %d entradas da lista de VOP do %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "Deletada 1 entrada da lista de HOP do %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "Deletada 1 entrada da lista de SOP do %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "Deletada 1 entrada da lista de VOP do %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "E-mail removido."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Fim da listagem."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Mensagem de entrada para o canal %s removida."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Bot não está no canal %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "  Mensagem de entrada: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Lista de acesso para %s está vazia."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Lista de acesso para %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Mensagem de entrada para o canal %s alterada."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Modo Fantasia está agora DESATIVADO no canal %s."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Modo mensagem de entrada está agora DESATIVADO no canal %s."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista de HOP para %s:\n"
-#~ "  Núm  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Erro interno - não foi possível processar seu pedido."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Logon news removido #%d."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Registro de nick (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Senha do nick (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Não foi encontrado \"#\" em frente ao nome do canal."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Modo NOBOT está agora DESATIVADO no canal %s."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Resultado não encontrado na lista de HOP do %s."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Resultado não encontrado na lista de SOP do %s."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Resultado não encontrado na lista de VOP do %s."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Entrada (#%d) não encontrada na lista de AOP do %s."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Entrada (#%d) não encontrada na lista de HOP do %s."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Entrada (#%d) não encontrada na lista de SOP do %s."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Entrada (#%d) não encontrada na lista de VOP do %s."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Opção Op-notice para %s está agora DESATIVADA."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Opção Peace para %s está agora DESATIVADA."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Modo Privado do bot %s está agora DESATIVADO."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Opção Private para %s está agora DESATIVADA."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Proteção de KILL está agora ATIVADA, sem tempo de espera."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER senha [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Opção de acesso restrito para %s está agora DESATIVADA."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista de SOP para %s:\n"
-#~ "  Núm  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Canal %s não está registrado"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND canal [motivo]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Opção Secure Founder para %s está agora DESATIVADA."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Opção Secure OPs para %s está agora DESATIVADA."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Opção Secure para %s está agora DESATIVADA."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Os Services não conseguiram alterar os modos. Seus servidores estão "
-#~ "configurados corretamente?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Services ativos %d dia, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Services ativos %d hora, %d minuto"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Services ativos %d hora, %d minutos"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Services ativos %d horas, %d minuto"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Services ativos %d minuto, %d segundo"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Services ativos %d minuto, %d segundos"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Services ativos %d minutos, %d segundo"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Opção Signed Kicks para %s está agora DESATIVADA."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Desculpe, a modificação da lista de HOP está temporariamente desabilitada."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Desculpe, a modificação da lista de SOP está temporariamente desabilitada."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Desculpe, a modificação da lista de VOP está temporariamente desabilitada."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Desculpe, você pode ter apenas %d entradas de AOP/SOP/VOP em um canal."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Modo SYMBIOSIS está agora DESATIVADO no canal %s."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "RANDOMNEWS ADD texto"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR canal opção"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "OPERNEWS ADD texto"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Sintaxe: SET DEBUG {ON | OFF | número}\n"
-#~ "\n"
-#~ "Ativa ou desativa o modo de depuração (debug). No modo de\n"
-#~ "depuração, todos os dados enviados para os Services e vindos\n"
-#~ "deles, assim como um número de outras mensagens de depuração\n"
-#~ "são enviadas a um arquivo de log. Se número é fornecido,\n"
-#~ "o modo de depuração é ativado, com nível de depuração ajustado\n"
-#~ "para número.\n"
-#~ "\n"
-#~ "Esta opção é equivalente à opção da linha de comando\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Sintaxe: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Trava de tópico para %s está agora DESATIVADA."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Retenção de tópico para %s está agora DESATIVADA."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Comando desconhecido: %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Opção desconhecida: %s.\n"
-#~ "Digite /msg %s HELP KICK para maiores informações."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "Usuário %s não encontrado na DB do NickServ."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Lista de VOP para %s:\n"
-#~ "  Núm  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Bot %s foi removido."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[Auto-Memo] O memo que você enviou para %s foi lido."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Último memo enviado para %s foi cancelado."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Seu vhost %s está agora ativado."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Bot %s foi removido."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "Sistema de acesso xOP para %s está agora DESATIVADO."
diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po
index 6de109a83..bb66669f9 100644
--- a/language/anope.ru_RU.po
+++ b/language/anope.ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 21:10-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -17,11 +17,68 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "/msg %s HELP %s äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s èçìåíèë óğîâåíü DEFCON íà %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s äîáàâëåí â ñïèñîê äîñòóïà êàíàëà %s ñ óğîâíåì äîñòóïà %d."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê àâòîêèêîâ êàíàëà %s."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê ïëîõèõ ñëîâ êàíàëà %s."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê AKILL'îâ."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SNLINE'îâ."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SQLINE'îâ."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SZLINE'îâ."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -38,15 +95,16 @@ msgstr ""
 "Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè ïî êàêîé-ëèáî êîìàíäå èñïîëüçóéòå:\n"
 "/msg %s HELP êîìàíäà."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s ïîçâîëÿåò Âàì óñòàíîâèòü áîòà íà ñâîé êàíàë.\n"
 "Äàíûé ñåğâèñ ñäåëàí äëÿ òåõ ïîëüçîâàòåëåé, êîòîğûå\n"
@@ -57,8 +115,8 @@ msgstr ""
 "èíôîğìàöèè ïî êîíêğåòíîé êîìàíäå, íàïèøèòå\n"
 "/msg  %s HELP êîìàíäà."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -79,127 +137,56 @@ msgstr ""
 "/msg %s HELP êîìàíäà\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"Îñíîâíîå ïğåäíàçíà÷åíèå %s - ıòî äàòü çàğåãèñòğèğîâàííûì\n"
-"ïîëüçîâàòåëÿì âîçìîæíîñòü ïîñûëàòü äğóã-äğóãó êîğîòêèå \"çàïèñêè\",\n"
-"íàçûâàåìûå òàê æå ìåìî-ñîîáùåíèÿìè. Äàííûé ñåğâèñ îñîáåííî óäîáåí,\n"
-"êîãäà âàì íåîáõîäèìî ÷òî-òî ñîîáùèòü èíòåğåñóşùåìó âàñ ÷åëîâåêó, à\n"
-"îí íà äàííûé ìîìåíò âíå ñåòè (offline).\n"
-" êà÷åñòâå îòïğàâèòåëÿ âû ìîæåòå óêàçàòü êàê íèê, òàê è èìÿ êàíàëà*.\n"
-"Ïîìíèòå, ÷òî îòïğàâêà ñîîáùåíèÿ âîçìîæíà ëèøü çàğåãèñòğèğîâàííîìó\n"
-"íà ñåğâèñàõ àäğåñàòó!\n"
-"\n"
-"Ñïèñîê êîìàíä %s:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s èçìåíèë óğîâåíü DEFCON íà %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s äîáàâëåí â ñïèñîê äîñòóïà êàíàëà %s ñ óğîâíåì äîñòóïà %d."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê àâòîêèêîâ êàíàëà %s."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê ïëîõèõ ñëîâ êàíàëà %s."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê AKILL'îâ."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SNLINE'îâ."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SQLINE'îâ."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "Çàïèñü âèäà %s óñïåøíî äîáàâëåíà â ñïèñîê SZLINE'îâ."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåğæèòñÿ â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "Çàïèñü âèäà %s óæå ïğèñóòñòâóåò â ñïèñêå àâòîêèêîâ êàíàëà %s."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "Çàïèñü âèäà %s óæå ïğèñóòñòâóåò â ñïèñêå AKILL'îâ."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "Çàïèñü âèäà %s óæå ïğèñóòñòâóåò â ñïèñêå èñêëş÷åíèé èç ëèìèòà ñåññèé."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåğæèòñÿ â ñïèñêå SNLINE'îâ."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåğæèòñÿ â ñïèñêå SQLINE'îâ."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "Çàïèñü âèäà %s óæå ñîäåğæèòñÿ â ñïèñêå SZLINE'îâ."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "Çíà÷åíèå âèäà %s íå ìîæåò áûòü èñïîëüçîâàíî êàê êîë-âî êèêîâ äî áàíà."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s ïğèíóäèòåëüíî èçìåíèë âàøè ïîëüçîâàòåëüñêèå ğåæèìû."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -213,42 +200,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s óñïåøíî óäàëåí èç AOP'îâ êàíàëà %s."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "Íèê %s óñïåøíî óäàëåí èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "Çàïèñü âèäà %s óäàëåíà èç ñïèñêà àâòîêèêîâ êàíàëà %s."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà ïëîõèõ ñëîâ êàíàëà %s."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà èñêëş÷åíèé ëèìèòà ñåññèé."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà AKILL'îâ."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SNLINE'îâ."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SQLINE'îâ."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SZLINE'îâ."
@@ -258,73 +245,85 @@ msgstr "Çàïèñü âèäà %s óñïåøíî óäàëåíà èç ñïèñêà SZLINE'îâ."
 msgid "%s deleted from your access list."
 msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "Óğîâåíü äîñòóïà ê %s íà êàíàëå %s îòêëş÷åí."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s èìååò ñëèøêîì ìíîãî çàğåãèñòğèğîâàííûõ êàíàëîâ."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"Îñíîâíîå ïğåäíàçíà÷åíèå %s - ıòî äàòü çàğåãèñòğèğîâàííûì\n"
+"ïîëüçîâàòåëÿì âîçìîæíîñòü ïîñûëàòü äğóã-äğóãó êîğîòêèå \"çàïèñêè\",\n"
+"íàçûâàåìûå òàê æå ìåìî-ñîîáùåíèÿìè. Äàííûé ñåğâèñ îñîáåííî óäîáåí,\n"
+"êîãäà âàì íåîáõîäèìî ÷òî-òî ñîîáùèòü èíòåğåñóşùåìó âàñ ÷åëîâåêó, à\n"
+"îí íà äàííûé ìîìåíò âíå ñåòè (offline).\n"
+" êà÷åñòâå îòïğàâèòåëÿ âû ìîæåòå óêàçàòü êàê íèê, òàê è èìÿ êàíàëà*.\n"
+"Ïîìíèòå, ÷òî îòïğàâêà ñîîáùåíèÿ âîçìîæíà ëèøü çàğåãèñòğèğîâàííîìó\n"
+"íà ñåğâèñàõ àäğåñàòó!\n"
+"\n"
+"Ñïèñîê êîìàíä %s:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr ""
 "Óêàçàííàÿ ìàñêà âèäà %s ñîâïàäàåò ñ îäíîé èç ìàñîê â ñïèñêå AKILL'îâ: %s."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "Ìàñêà âèäà %s óñïåøíî äîáàâëåíà â âàø ñïèñîê äîñòóïà."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "×èñëî %s íå ÿâëÿåòñÿ âàëèäíûì íîìåğîì øàáëîíà áàíìàñêè."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr ""
 "Óêàçàííûé ïàğàìåòğ %s íå ÿâëÿåòñÿ íèêîì áîòà èëè çàğåãèñòğèğîâàííûì êàíàëîì."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "Email-àäğåñ âèäà %s íå ÿâëÿåòñÿ ïğàâèëüíûì ıëåêòğîííîé ïî÷òû."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "Ïîëüçîâàòåëü %s íå ïğèñóòñòâóåò â äàííûé ìîìåíò íà êàíàëå %s"
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "Íèê %s â ñïèñêå èãíîğèğóåìûõ íå îáíàğóæåí."
 
-#: include/language.h:90
-#, fuzzy, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"Îäíà èç ìàñîê â ñïèñêå èñêëş÷åíèé êàíàëà ñîâïàäàåò ñ õîñòìàñêîé ïîëüçîâàòåëÿ "
-"%s. ×òî áû çàáàíèòü åãî, âû äîëæíû óäàëèòü èñêëş÷åíèÿ."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -335,12 +334,12 @@ msgstr "%s ïåğåìåùåí â AOP'û êàíàëà %s."
 msgid "%s not found on %s %s list."
 msgstr "Íèê %s â ñïèñêå AOP'îâ êàíàëà %s íå îáíàğóæåí."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Íèê %s â ñïèñêå äîñòóïà êàíàëà %s íå îáíàğóæåí."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàğóæåíà."
@@ -350,32 +349,32 @@ msgstr "Çàïèñü âèäà %s â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàğóæåíà."
 msgid "%s not found on %s bad words list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s íå îáíàğóæåíà."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "Õîñò âèäà %s â ñïèñêå ñåññèé íå ÷èñëèòñÿ."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå èñêëş÷åíèé èç ëèìèòà ñåññèé íå îáíàğóæåíà."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå AKILL'îâ íå îáíàğóæåíà."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SNLINE'îâ íå îáíàğóæåíà."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SQLINE'îâ íå îáíàğóæåíà."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "Çàïèñü âèäà %s â ñïèñêå SZLINE'îâ íå îáíàğóæåíà."
@@ -385,12 +384,17 @@ msgstr "Çàïèñü âèäà %s â ñïèñêå SZLINE'îâ íå îáíàğóæåíà."
 msgid "%s not found on your access list."
 msgstr "Ìàñêà âèäà %s íå íàéäåíà â âàøåì ñïèñêå äîñòóïà."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "Ìàñêà âèäà %s íå íàéäåíà â âàøåì ñïèñêå äîñòóïà."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "Ìàñêà âèäà %s óñïåøíî óäàëåíà èç âàøåãî ñïèñêà äîñòóïà."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -415,18 +419,12 @@ msgid "%s will now permanently be ignored."
 msgstr ""
 "Íèê %s äîáàâëåí â ñïèñîê èãíîğèğîâàíèÿ, ïğîäîëæèòåëüíîñòü èãíîğà: ïîñòîÿííî."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Ïğèìå÷àíèå: âñå êîìàíäû %s'ó çàïèñûâàşòñÿ â ëîã!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr ""
-"Ïğèìå÷àíèå: ñåé÷àñ ñåğâèñû ğàáîòàşò â ğåæèìå read-only (òîëüêî-÷òåíèå), "
-"íèêàêèå èçìåíåíèÿ ñîõğàíåíû ÍÅ áóäóò!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -434,11 +432,12 @@ msgstr ""
 "Ïîìíèòå: AKILL-çàïèñü áàçèğóåòñÿ íà ìàñêå âèäà èäåíò@õîñò, "
 "èñïîëüçîâàíèå íèêà â êà÷åñòâå ìàñêè íåäîïóñòèìî!"
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Ïîìíèòå: ñïèñîê SZLINE'îâ ìîæåò ñîäåğæàòü òîëüêî IP-ìàñêè!"
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -491,22 +490,22 @@ msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr ""
 "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîğûå âû ïîñûëàëè %s, áûëî ïğî÷èòàíî."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER ïàğîëü email"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER ïàğîëü email"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP ãëàâíûé_íèê ïàğîëü"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -525,7 +524,7 @@ msgstr ""
 "íèêîâ è äğóãèå çëîíàìåğåííûå äåéñòâèÿ - ïğèâåäóò, êàê ìèíèìóì, ê\n"
 "óíè÷òîæåíèş ıòèõ ñàìûõ íèêîâ."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -537,7 +536,8 @@ msgstr ""
 "ê  íåìó  â  êà÷åñòâå  âëàäåëüöà, ìîãóò ïğîñìàòğèâàòü ñïèñêè äîñòóïà\n"
 "êàíàëîâ, à òàê æå, ñïèñêè àêèêîâ è óñòàíîâêè óğîâíåé äîñòóïà êàíàëîâ."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -549,981 +549,343 @@ msgstr ""
 "ê íåìó, à òàê æå, ìîãóò ñìîòğåòü ñïèñîê äîñòóïà ëşáîãî íèêà\n"
 "(áîëåå ïîäğîáíî ñì. /msg %s ACCESS LIST íèê)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "Àêòèâèğîâàííûå îïöèè.: %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "Âèğòóàëüíûé õîñò........: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "Âèğòóàëüíûé õîñò........: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "Íèê áîòà.............: %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "Íèê áîòà.............: áîò íå íàçíà÷åí."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "Àêòèâèğîâàííûå îïöèè....: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "Öåíçîğ CapsLOCK......: %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "Öåíçîğ CapsLOCK......: %s (%d êèêîâ äî áàíà; ìèíèìóì %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "Öåíçîğ CapsLOCK......: %s (ìèíèìóì %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "Âëàäåëåö..................: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "Òèï áàíà..................: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "Öåíçîğ æèğíûõ áóêâ...: %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ æèğíûõ áóêâ...: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "Öåíçîğ ôëóäà.........: %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "Öåíçîğ ôëóäà.........: %s (%d êèêîâ äî áàíà; %d ëèíèé èç %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "Öåíçîğ ôëóäà.........: %s (%d ëèíèé çà %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "Ìàñêà...........: %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "Öåíçîğ öâåòîâ........: %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ öâåòîâ........: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "Ğåãèñòğàöèÿ èñòåêàåò......: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "Òèï áàíà..................: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr "Ïîñëåäíèé ğàç èñïîëüçîâàí.: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "Áëîêèğîâêà ğåæèìîâ........: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "Öåíçîğ ïîâòîğîâ......: %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "Öåíçîğ ïîâòîğîâ......: %s (%d êèêîâ äî áàíà; %d ğàç)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "Öåíçîğ ïîâòîğîâ......: %s (%d ğàç)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "Íàñëåäíèê.................: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "Êàíàë 'çàìîğîæåí': [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "Öåíçîğ CapsLOCK......: %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ æèğíûõ áóêâ...: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "Ïîñëåäíèé òîïèê...........: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "Çàğåãèñòğèğîâàí...........: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (îòêëş÷åíî)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (òîëüêî äëÿ âëàäåëüöà)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     Óïğàâëåíèå ACCESS-ñïèñêîì íèêà (ñïèñêîì õîñòìàñîê)"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Óïğàâëåíèå ACCESS-ñïèñêîì ïğèâèëåãèé êàíàëà"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr "ACT                Âûïîëíèòü äåéñòâèå îò ëèöà áîòà íà óêàçàííîì êàíàëå"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Óïğàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Óïğàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       Óïğàâëåíèå ñïèñêîì AKILL'îâ"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      Âûâîä ñïèñêà êàíàëîâ, íà êîòîğûõ ó âàñ åñòü äîñòóï"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        Óïğàâëåíèå ñïèñêîì AOP'îâ êàíàëà"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Óñòàíîâêà áîòà íà óêàçàííûé êàíàë"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     àêòèâèğîâàíèå/äåàêòèâèğîâàíèå àâòîñòàòóñà"
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     àêòèâèğîâàíèå/äåàêòèâèğîâàíèå ğåæèìà àâòîñòàòóñà"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Óïğàâëåíèå ñïèñêîì \"ïëîõèõ\" ñëîâ"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Óñòàíîâêà áàíà íà êàíàëå"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       óñòàíîâêà òèïà áàíà ñåğâèñàìè íà êàíàëå"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Óïğàâëåíèå ñåğâèñíûìè áîòàìè"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Ñïèñîê äîñòóïíûõ äëÿ óñòàíîâêè áîòîâ"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Îòìåíà ïîñëåäíåãî îòïğàâëåííîãî âàìè ìåìî-ñîîáùåíèÿ"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    \"Ïğèáèòü\" âñåõ ïîëüçîâàòåëåé íà óêàçàííîì êàíàëå"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Ñïèñîê òåêóùèõ àêòèâíûõ êàíàëîâ ñåòè"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr ""
-"    CHECK  Ïğîâåğêà íà òî, áûëî ëè ïğî÷èòàíî ïîñëåäíåå ïîñëàííîå âàìè "
-"ñîîáùåíèå"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Î÷èñòêà îïğåäåëåííûõ ğåæèìîâ êàíàëà"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Ïîäòâåğæäåíèå ğåãèñòğàöèè êîäîì àóòåíôèêàöèè"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "Ñîçäàí..........: %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Óïğàâëåíèå ñèñòåìîé DefCon (çàùèòíûõ êîíòğìåğ)"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr ""
-"    DEHALFOP   Ñíÿòèå ğåæèìà ïîëóîïåğàòîğà (-h) ñ óêàçàííîãî íèêà íà êàíàëå"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Óäàëåíèå âèğòóàëüíîãî õîñòà"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Óäàëåíèå ìåìî-ñîîáùåíèé"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Óäàëåíèå âèğò. õîñòà ó âñåõ íèêîâ óêàçàííîé ãğóïïû"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr ""
-"    DEOP       Ñíÿòèå ğåæèìà îïåğàòîğà (-o) ñ óêàçàííîãî íèêà íà êàíàëå"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Ñíèìàåò ñ âàñ ñòàòóñ âëàäåëüöà êàíàëà"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Ñíÿòèå ğåæèìà çàùèòû (+a) ñ óêàçàííîãî íèêà íà êàíàëå"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          èçìåíåíèå îïèñàíèÿ êàíàëà"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Ñíÿòèå ğåæèìà âîéñà (-v) ñ óêàçàííîãî íèêà íà êàíàëå"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãğóïïû"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãğóïïû"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Óäàëåíèå êàíàëà èç áàçû äàííûõ ñåğâèñîâ"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Îòìåíà ğåãèñòğàöèè íèêà (óäàëåíèå)"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "Îïèñàíèå..................: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      óñòàíîâêà email-àäğåñà íà íèê"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      óñòàíîâêà email-àäğåñà íà íèê"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Óïğàâëåíèå ñïèñêîì èñêëş÷åíèé èç ëèìèòà ñåññèé"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Óñòàíîâêà çàïğåòà íà èñïîëüçîâàíèå/ğåãèñòğàöèş êàíàëà"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Óñòàíîâêà çàïğåòà íà èñïîëüçîâàíèå/ğåãèñòğàöèş íèêà"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       ñìåíà âëàäåëüöà êàíàëà"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr "    GETEMAIL   Çàïğîñ ñïèñêà âñåõ íèêîâ ñ óêàçàííûì email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Çàïğîñ óñòàíîâëåííîãî íà êàíàëå êëş÷à (+k)"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr "    GETPASS    Çàïğîñ ïàğîëÿ óêàçàííîãî íèêà"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Îòêëş÷åíèå \"ìåğòâîé\" IRC-ñåññèé ñ âàøèì íèêîì"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Ñïèñîê âñåõ íèêîâ â âàøåé ãğóïïå"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Îòïğàâêà ãëîáàëüíîãî ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      óñòàíîâêà ïğèâåòñòâåííîãî ñîîáùåíèÿ"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      óñòàíîâêà ïğèâåòñòâåííîãî ñîîáùåíèÿ"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Ñèíõğîíèçèğóåò âèğòóàëüíûé õîñò äëÿ âñåõ íèêîâ ãğóïïû"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Îáúåäèíåíèå íèêîâ â ãğóïïû"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "Òåêñò ïğèâåòñòâèÿ.......: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr ""
-"    HALFOP     Óñòàíîâêà ñòàòóñà ïîëóîïåğàòîğà (+h) óêàçàííîìó íèêó íà êàíàëå"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       ñêğûòèå ğàçëè÷íîé èíôîğìàöèè î âàøåì íèêå"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Óïğàâëåíèå ñïèñêîì HOP'îâ êàíàëå"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Èäåíòèôèêàöèÿ ê íèêó â êà÷åñòâå âëàäåëüöà"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Óïğàâëåíèå èãíîğ-ñïèñêîì ñåğâèñîâ"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Óïğàâëåíèå èãíîğ-ñïèñêîì ñåğâèñîâ"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr "INFO               Çàïğîñ èíôîğìàöèè î áîòå è åãî íàñòğîéêàõ íà êàíàëå"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Èíôîğìàöèÿ î êàêîì-ëèáî íèêå"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Çàïğîñ èíôîğìàöèè îá óêàçàííîì êàíàëå"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Èíôîğìàöèÿ î êîë-âå ñîîáùåíèé è íàñòğîéêàõ îïîâåùåíèÿ"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        \"Äæóï\" óêàçàííîãî ñåğâåğà ñåòè"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     àêòèâèğîâàíèå àâòîñîõğàíåíèÿ òîïèêà êàíàëà"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Íàñòğîéêà óñëîâèé KICK'à"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Êèêíóòü ïîëüçîâàòåëÿ ñ êàíàëà ïîñğåäñòâîì ñåğâèñîâ"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Âûêèäûâàåò óêàçàííîãî ïîëüçîâàòåëÿ ñ êàíàëà"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       àêòèâèğîâàíèå/äåàêòèâèğîâàíèå ğåæèìà çàùèòû"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   âûáîğ ÿçûêà, ïîñğåäñòâîì êîòîğîãî\n"
-"               ñåğâèñû áóäóò ñ âàìè îáùàòüñÿ"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Ïåğåóñòàíîâêà çíà÷åíèÿ óğîâíåé äîñòóïà êàíàëà"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Âûâîä ñïèñêà âñåõ âèğòóàëüíûõ õîñòîâ"
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr "    LIST       Ñïèñîê âñåõ çàğåãèñòğèğîâàííûõ íèêîâ ïî ìàñêå"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr "    LIST       Çàïğîñ ñïèñêà âñåõ çàğåãèñòğèğîâàííûõ êàíàëîâ"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Ñïèñîê âàøèõ ìåìî-ñîîáùåíèé"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr "    LOGONNEWS   Óïğàâëåíèå ñïèñêîì íîâîñòåé ïğè ïîäêëş÷åíèè"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Äåèäåíòèôèêàöèÿ îò èñïîëüçóåìîãî íà äàííûé ìîìåíò íèêà"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Èçìåíåíèå êàêîãî-ëèáî ğåæèìà íà óêàçàííîì êàíàëà"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Î÷èñòêà âñåõ ğåæèìîâ óêàçàííîãî êàíàëà"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Èíôîğìàöèÿ î çàãğóæåííîì ìîäóëå"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     Ñïèñîê çàãğóæåííûõ ìîäóëåé"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Çàãğóçèòü ìîäóëü"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Çàãğóçèòü ìîäóëü"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Âûãğóçèòü ìîäóëü"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        âûáîğ ìåòîäà îáùåíèÿ ñåğâèñîâ ñ âàìè"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   óñòàíîâêà íà íèê ò.í. ğåæèìà 'íå-èñòå÷åíèÿ'"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr ""
-"    NOOP        Âğåìåííîå óäàëåíèå âñåõ O:line'îâ ñ óêàçàííîãî\n"
-"                ñåğâåğà ñåòè"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Äåàêòèâèğóåò âàø òåêóùèé âèğòóàëüíûé õîñò"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Óñòàíîâêà îïåğôëàãîâ óêàçàííîìó ïîëüçîâàòåëş ñåòè"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Àêòèâèğóåò íàçíà÷åííûé âàì âèğòóàëüíûé õîñò"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr ""
-"    OP         Óñòàíîâêà ñòàòóñà îïåğàòîğà (+o) óêàçàííîìó íèêó íà êàíàëå"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr "    OPERNEWS    Óïğàâëåíèå ñïèñêîì îïåğ-íîâîñòåé"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr ""
-"    OPNOTICE      àêòèâèğîâàíèå óâåäîìëåíèé îá èñïîëüçîâàíèè\n"
-"                  êîìàíä OP/DEOP"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Çàïğîñ ñòàòóñà âëàäåëüöà íà êàíàëå"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "Îïöèè...........: %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàğîëÿ íà íèê"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàğîëÿ íà íèê"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         àêòèâèğîâàíèå ğåæèìà \"ñïîêîéñòâèÿ\" íà êàíàëå"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       ñêğûòèå êàíàëà â ñïèñêå êàíàëîâ âûâîäèìûõ ïî LIST"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr "    PRIVATE    ñêğûòèå íèêà â ñïèñêå íèêîâ ïî /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Óñòàíîâêà ğåæèìà çàùèòû (+a) óêàçàííîìó íèêó íà êàíàëå"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Çàâåğøèòü ğàáîòó ñåğâèñîâ áåç ñîõğàíåíèÿ áàçû äàííûõ"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr "    RANDOMNEWS  Óïğàâëåíèå ñïèñêîì ñëó÷àéíûõ íîâîñòåé"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   ×òåíèå êàêîãî-ëèáî ñîîáùåíèÿ, ãğóïïû ñîîáùåíèé"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr ""
-"    RECOVER    Îñâîáîæäåíèå âàøåãî íèêà îò èñïîëüçîâàíèÿ åãî êåì-òî äğóãèì"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Ğåãèñòğàöèÿ íèêà"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Ğåãèñòğàöèÿ íèêà"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE    Ñíÿòèå çàùèòû ñåğâèñîâ ñ âàøåãî íèêà ïîñëå êîìàíäû RECOVER"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Ïåğåçàãğóçêà êîíôèãóğàöèîííîãî ôàéëà ñåğâèñîâ"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Ïîâòîğíûé çàïğîñ auth-êîäà íà email"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr "    RESTART     Ñîõğàíèòü áàçû äàííûõ è ïåğåçàïóñòèòü ñåğâèñû"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    îãğàíè÷åíèå óğîâíÿ äîñòóïà íà êàíàë äî ïğîïèñàííûõ"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr ""
-"    RSEND  Îòïğàâêà ìåìî-ñîîáùåíèÿ ñ óñëîâèåì ïîäòâåğæäåíèÿ î ïğî÷òåíèè"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "Öåíçîğ èíâåğñèé......: %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ èíâåğñèé......: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Óñòàíîâêà ğàçëè÷íûõ îïöèé êàêîãî-ëèáî íèêà"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr "SAY                Ïîñëàòü íà óêàçàííûé êàíàë òåêñò îò ëèöà áîòà"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        äîïîëíèòåëüíûå âîçìîæíîñòè %s'à ïî áåçîïàñíîñòè"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     àêòèâèğîâàíèå/äåàêòèâèğîâàíèå ğåæèìà áåçîïàñíîñòè"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER îãğàíè÷åíèå íà ïîëó÷åíèå ñòàòóñà âëàäåëüöà êàíàëà"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     êîíòğîëü çà ïîëó÷åíèåì ñòàòóñà îïåğàòîğà êàíàëà"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Îòïğàâêà ìåìî-ñîîáùåíèÿ óêàçàííîìó íèêó èëè êàíàëó"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Îòïğàâêà ìàññîâîãî ìåìî-ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Çàïğîñ ïàğîëÿ îò íèêà íà email-àäğåñ"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Ïğîñìîòğ êîëè÷åñòâà ñåññèé ñ óêàçàííîãî õîñòà"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Íàñòğîéêà ğàçëè÷íûõ îïöèé áîòà"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Óñòàíîâêà âèğòóàëüíîãî õîñòà óêàçàííîìó ïîëüçîâàòåëş"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Íàñòğîéêà ğàçëè÷íûõ îïöèé ñåğâèñîâ"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Íàñòğîéêà ğàçëè÷íûõ îïöèé êàíàëà"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Íàñòğîéêà îïöèé íèêà, âêëş÷àÿ çàùèòó KILL'îì"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Óñòàíîâêà îïöèé äëÿ ìåìî-ñîîáùåíèé"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Óñòàíîâêà âèğò. õîñòà äëÿ âñåõ íèêîâ óêàçàííîé ãğóïïû"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Çàâåğøèòü ğàáîòó ñåğâèñîâ ñ ñîõğàíåíèåì áàçû äàííûõ"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      íàñòğîéêà ğåæèìà \"ïîäïèñàííûõ êèêîâ\""
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      Óïğàâëåíèå ñïèñêîì SNLINE'îâ"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        Óïğàâëåíèå ñïèñêîì SOP'îâ êàíàëà"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      Óïğàâëåíèå ñïèñêîì SQLINE'îâ"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Ñïèñîê âñåõ ïğîïèñàííûõ íà ñåğâèñàõ è èõ îíëàéí-ñòàòóñ"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr ""
-"    STAFF  Îòïğàâêà ìåìî-ñîîáùåíèÿ âñåì îïåğàòîğàì/àäìèíèñòğàòîğàì ñåòè"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Çàïğîñ èíôîğìàöè î ñòàòóñå ñåğâèñîâ è ñåòè"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr ""
-"    STATUS     Âîçâğàùàåò òåêóùèé óğîâåíü äîñòóïà äëÿ óêàçàííîãî\n"
-"               ïîëüçîâàòåëÿ íà óêàçàííîì êàíàëå"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr ""
-"    STATUS     Çàïğîñ ñòàòóñà èäåíòèôèêàöèè óêàçàííîãî íèêà íà ñåğâèñàõ"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     óñòàíîâêà íàñëåäíèêà êàíàëà"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Ïğèîñòàíîâêà ğàáîòû êàíàëà, ñ ñîõğàíåíèåì âñåõ äàííûõ\n"
-"               è íàñòğîåê êàíàëà"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Óñòàíîâêà ğåæèìà ñàñïåíäà (\"çàìîğîçêè\") íà íèê"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Ïğèíóäèòåëüíîå èçìåíåíèå íèêà ïîëüçîâàòåëÿ ñåòè"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      Óïğàâëåíèå ñïèñêîì SZLINE'îâ"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Óñòàíîâêà òîïèêà íà êàíàëå ïîñğåäñòâîì ñåğâèñîâ"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     áëîêèğîâêà òîïèêà êàíàëà îò èçìåíåíèé åãî êåì-ëèáî"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Èçìåíåíèå ğåæèìîâ êàêîãî-ëèáî ïîëüçîâàòåëÿ ñåòè"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Ñíÿòü áîòà ñ óêàçàííîãî êàíàëà"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Ñíÿòèå ğåæèìà ñàñïåíäà ñ êàíàëà (âîññòàíîâëåíèå)"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Ñíÿòèå ğåæèìà ñàñïåíäà ñ íèêà"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr "    UPDATE      Îáíîâëåíèå áàç äàííûõ ñåğâèñîâ (ñîõğàíåíèå íà äèñê)"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr "    UPDATE     Îáíîâëåíèå âàøåãî òåêóùåãî ñòàòóñà íà ñåğâèñàõ"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Ñïèñîê òåêóùèõ ïîëüçîâàòåëåé ñåòè"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Êîë-âî êàíàëîâ..: %d"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Óñòàíîâêà ñòàòóñà âîéñà (+v) óêàçàííîìó íèêó íà êàíàëå"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Óïğàâëåíèå ñïèñêîì VOP'îâ êàíàëà"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           íàñòğîéêà ñèñòåìû ïğèâèëåãèé êàíàëà"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (èñòåêàåò %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "Öåíçîğ ïëîõèõ ñëîâ...: %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ ïëîõèõ ñëîâ...: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "Email-àäğåñ.............: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "Ñåé÷àñ îíëàéí, c ìàñêîé.: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "Ïîñëåäíèé ğàç çàìå÷åí...: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "Òîïèê óñòàíîâèë...........: %s"
@@ -1533,20 +895,6 @@ msgstr "Òîïèê óñòàíîâèë...........: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1557,26 +905,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1586,41 +925,46 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "Ğåàëüíîå èìÿ....: %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "Çàğåãèñòğèğîâàí.........: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Öåíçîğ ïîä÷åğêèâàíèé.: %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Öåíçîğ ïîä÷åğêèâàíèé.: %s (%d êèêîâ äî áàíà)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr "  %c    %s    %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr "  %c    %s    %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " No.  Ïîñëàë            Äàòà/Âğåìÿ"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1628,58 +972,36 @@ msgstr ""
 "Àäğåñàöèÿ âèäà \"/msg %s\" áîëüøå íå ïîääåğæèâàåòñÿ. Èñïîëüçóéòå \"/msg %s@%s"
 "\" èëè \"/%s\"."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        \"Äæóï\" óêàçàííîãî ñåğâåğà ñåòè"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d * Íèê: %s * âèğòóàëüíûé õîñò: %s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d * Íèê: %s * âèğòóàëüíûé õîñò: %s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (îò %s â %s; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (îò %s â %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1698,17 +1020,12 @@ msgstr ""
 "%5d (%s îò %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "Ñïèñîê êîìàíä %s:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s íå óâåäîìëÿåòñÿ î íîâûõ ñîáùåíèÿõ."
@@ -1718,34 +1035,34 @@ msgstr "%s íå óâåäîìëÿåòñÿ î íîâûõ ñîáùåíèÿõ."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (îò %s â %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "Êîëè÷åñòâî çàãğóæåííûõ ìîäóëåé: %d"
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "Êîëè÷åñòâî äîñòóïíûõ áîòîâ: %d"
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "Êîëè÷åñòâî íèêîâ â ãğóïïå: %d"
@@ -1756,14 +1073,14 @@ msgstr "Êîëè÷åñòâî íèêîâ â ãğóïïå: %d"
 msgid "%s %s list is empty."
 msgstr "Ñïèñîê AOP'îâ êàíàëà %s ïóñò."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "Ñïèñîê äîñòóïà êàíàëà %s ïóñò."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s ïóñò."
@@ -1773,7 +1090,7 @@ msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s ïóñò."
 msgid "%s bad words list is empty."
 msgstr "Ñïèñîê ïëîõèõ ñëîâ êàíàëà %s ïóñò."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s íå ìîæåò áûòü íàñëåäíèêîì êàíàëà %s òàê êàê îí åãî âëàäåëåö."
@@ -1783,47 +1100,47 @@ msgstr "%s íå ìîæåò áûòü íàñëåäíèêîì êàíàëà %s òàê êàê îí åãî âëàäåëåö."
 msgid "%s cannot receive memos."
 msgstr "Àäğåñàò %s íå ìîæåò ïğèíèìàòü ñîîáùåíèÿ."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "Ñïèñîê êîìàíä %s:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "Ãğàíèöû ìàñêè %s ñëèøêîì øèğîêè, ïîæàëóéñòà, óòî÷íèòå ìàñêó."
+msgid "%s commands:"
+msgstr "Ñïèñîê êîìàíä %s:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, %d èç íèõ âñå åùå íå ïğî÷èòàíû."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, 1 èç íèõ âñå åùå íå ïğî÷èòàíî."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s ñåé÷àñ èìååò %d ñîîáùåíèé, íè îäíî èç íèõ íå ïğî÷èòàíî."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s ñåé÷àñ èìååò 1 íîâîå, íåïğî÷èòàííîå ñîîáùåíèå."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s ñåé÷àñ èìååò 1 ñîîáùåíèå."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "Ñïèñîê ñîîáùåíèé äëÿ %s íà äàííûé ìîìåíò ïóñò."
@@ -1835,47 +1152,27 @@ msgstr ""
 "Ñïèñîê ñîîáùåíèé äëÿ %s ïåğåïîëíåí è ïğèíèìàòü íà äàííûé ìîìåíò íîâûå îí íå "
 "ìîæåò."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s îòêëş÷åí."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "Ñïèñîê ñîîáùåíèé êàíàëà %s ïóñò."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "Íîâûõ ñîîáùåíèé äëÿ %s íå îáíàğóæåíî."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "%s ıòî %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s íà äàííûé ìîìåíò íåàêòèâåí (skeleton-ğåæèì)."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "%s ñåé÷àñ â ñåòè."
@@ -1897,24 +1194,24 @@ msgstr "Ğåæèì %s: âêëş÷åí."
 msgid "%s is no longer a Super-Admin"
 msgstr "%s ñíÿë ñ ñåáÿ ğåæèì Ñóïåğ-Àäìèíèñòğàòîğà."
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s íå óâåäîìëÿåòñÿ î íîâûõ ñîáùåíèÿõ."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñğàçó ïîñëå èäåíòèôèêàöèè èëè ïî ìåğå "
 "ïğèõîäà íîâûõ ñîáùåíèé."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñğàçó ïîñëå èäåíòèôèêàöèè ê íèêó."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s óâåäîìëÿåòñÿ î íîâûõ ñîîáùåíèÿõ ñğàçó ïğè ïîñòóïëåíèè îíûõ."
@@ -1933,6 +1230,11 @@ msgstr ""
 "Ñïèñîê AOP'îâ êàíàëà %s:\n"
 " Íîìåğ  Íèê"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1976,63 +1278,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) äîáàâëåí â ñïèñîê áîòîâ."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "Ëèìèò ñîáùåíèé äëÿ %s ğàâåí %d è íå ìîæåò áûòü èçìåíåí."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s ğàâåí %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* Àâòîìàòè÷åñêàÿ óñòàíîâêà AKILL'îâ íà âñåõ íîâûõ êëèåíòîâ."
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Ïğèíóäèòåëüíàÿ óñòàíîâêà ğåæèìîâ %s íà âñå êàíàëû ñåòè."
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Èãíîğèğîâàíèå ïğîñòûõ ïîëüçîâàòåëåé ñ îïîâåùåíèåì èõ îá ıòîì."
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Àâòîìàòè÷åñêîå îòêëş÷åíèå îò ñåòè âñåõ íîâûõ êëèåíòîâ."
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* Çàïğåò íà èçìåíåíèå ïàğàìåòğîâ MLOCK."
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* Çàïğåò íà ğåãèñòğàöèş êàíàëîâ."
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* Çàïğåò íà îòïğàâêó ìåìî-ñîîáùåíèé."
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* Çàïğåò íà ğåãèñòğàöèş íèêîâ."
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Èãíîğèğîâàíèå ïğîñòûõ ïîëüçîâàòåëåé áåç óâåäîìëåíèÿ èõ îá ıòîì."
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Óìåíüøåíèå ëèìèòà ñåññèé ñ îäíîãî õîñòà äî %d."
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<íåèçâåñòíî>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr ""
 "Ìàññîâîå ñîîáùåíèå óñïåøíî îòïğàâëåíî âñåì çàğåãèñòğèğîâàííûì ïîëüçîâàòåëÿì."
@@ -2046,38 +1351,29 @@ msgstr ""
 "Ìåìî-èçâåùåíèå áûëî àâòîìàòè÷åñêè ïîñëàíî äëÿ %s, èíôîğìèğóşùåå îòïğàâèòåëÿ "
 "î òîì, ÷òî âû ïğî÷èòàëè åãî/åå ñîîáùåíèå."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "Auth-êîä áûë âûñëàí íà %s, äëÿ çàâåğøåíèÿ ğåãèñòğàöèè èñïîëüçóéòå êîìàíäó /"
 "msg %s confirm auth-êîä"
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "Óêàçàííûé âèğóòàëüíûé èäåíò èìååò íåâåğíûé ôîğìàò."
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Óêàçàííûé âèğóòàëüíûé õîñò èìååò íåâåğíûé ôîğìàò."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr "ACCESS #êàíàë {ADD|DEL|LIST|VIEW|CLEAR} [íèê [óğîâåíü] | íîìåğ_çàïèñè]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [ìàñêà]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT #êàíàë òåêñò"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [ìàñêà]"
@@ -2091,17 +1387,22 @@ msgstr ""
 "AKICK #êàíàë {ADD|STICK|UNSTICK|DEL|LIST|VIEW|ENFORCE|CLEAR} [íèê|ìàñêà] "
 "[ïğè÷èíà]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr "AKICK ENFORCE íà êàíàëå %s çàâåğøåí, ïîëüçîâàòåëåé çàáàíåíî: %d "
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    \"Ïğèáèòü\" âñåõ ïîëüçîâàòåëåé íà óêàçàííîì êàíàëå"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "Ñïèñîê AKILL'îâ ïóñò."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2110,43 +1411,34 @@ msgstr ""
 "AKILL {ADD|DEL|LIST|VIEW|CLEAR} [[+âğåìÿ_èñòå÷åíèÿ] {ìàñêà | íîìåğ_çàïèñè} "
 "[ïğè÷èíà]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN #êàíàë íèê"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Äîñòóï çàïğåùåí."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "Óğîâåíü äîñòóïà äëÿ %s íà êàíàëå %s èçìåíåí íà %d."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "Óğîâåíü äîñòóïà äëÿ %s íà êàíàëå %s îñòàëñÿ ïğåæíèì - %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Óğîâåíü äîñòóïà äîëæåí áûòü ìåæäó %d è %d âêëş÷èòåëüíî."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Óğîâåíü äîñòóïà äîëæåí áûòü îòëè÷åí îò íóëÿ."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "Óñòàíîâêè ñïèñêà äîñòóïà äëÿ êàíàëà %s:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "Óğîâíè äîñòóïà äëÿ êàíàëà %s ñáğîøåíû íà çíà÷åíèÿ ïî-óìîë÷àíèş."
@@ -2161,20 +1453,11 @@ msgstr "Ñïèñîê äîñòóïà äëÿ %s ïóñò."
 msgid "Access list for %s:"
 msgstr "Ñïèñîê äîñòóïà äëÿ %s:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"Ñïèñîê äîñòóïà êàíàëà %s:\n"
-"  Íîì.  Óğ.  Íèê"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Âàø òåêóùèé ñïèñîê äîñòóïà:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2183,6 +1466,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        äîïîëíèòåëüíûå âîçìîæíîñòè %s'à ïî áåçîïàñíîñòè"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Àêòèâèğóåò íàçíà÷åííûé âàì âèğòóàëüíûé õîñò"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2203,7 +1496,7 @@ msgstr "Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåğ: #%d"
 msgid "Added new random news item (#%d)."
 msgstr "Íîâîñòü óñïåøíî äîáàâëåíà, åå íîìåğ: #%d"
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2216,22 +1509,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "Âñå OLINE-çàïèñè íà ñåğâåğå %s áûëè óäàëåíû."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "Âñå OLINE-çàïèñè íà ñåğâåğå %s âîññòàíîâëåíû."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
@@ -2240,12 +1533,12 @@ msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
 msgid "All logon news items deleted."
 msgstr "Ñïèñîê íîâîñòåé ïîëíîñòüş î÷èùåí."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "Âñå ñîîáùåíèÿ êàíàëà %s áûëè óäàëåíû."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Âñå âàøè âîîáùåíèÿ áûëè óäàëåíû."
 
@@ -2257,22 +1550,22 @@ msgstr "Ñïèñîê íîâîñòåé äëÿ îïåğàòîğîâ ïîëíîñòüş î÷èùåí."
 msgid "All random news items deleted."
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "Âñå ïîëüçîâàòåëè êàíàëà %s êèêíóòû."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ íèêîâ ãğóïïû %s óñòàíîâëåíû íà %s@%s"
@@ -2394,12 +1687,32 @@ msgstr "Óğîâåíü äîñòóïà ê êîìàíäàì FANTASY-ğåæèìà"
 msgid "Allowed to view the access list"
 msgstr "Óğîâåíü äîñòóïà ê êîìàíäå ACCESS LIST"
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr "INFO               Çàïğîñ èíôîğìàöèè î áîòå è åãî íàñòğîéêàõ íà êàíàëå"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Óñòàíîâêà áîòà íà óêàçàííûé êàíàë"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      óñòàíîâêà ïğèâåòñòâåííîãî ñîîáùåíèÿ"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      óñòàíîâêà email-àäğåñà íà íèê"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Àâòîñòàòóñ"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà %s:"
@@ -2424,17 +1737,17 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Óğîâåíü äîñòóïà ê àâòîñòàòóñó âîéñà (+v)"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr ""
 "BADWORDS #êàíàë {ADD|DEL|LIST|CLEAR} [ñëîâî|íîìåğ_çàïèñè] [SINGLE|START|END]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2453,26 +1766,26 @@ msgstr ""
 "Ñïèñîê ïëîõèõ ñëîâ äëÿ %s:\n"
 "  No.   Ñëîâî                          Òèï"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Ñïèñîê \"ïëîõèõ\" ñëîâ ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "Øàáëîí áàíìàñêè íà êàíàëå %s èçìåíåí íà #%d."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Óñòàíîâêà áàíà íà êàíàëå"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "Áîò ñ íèêîì %s óæå ñóùåñòâóåò."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Áîòà %s íå ñóùåñòâóåò."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "Áîò %s óñïåøíî íàçíà÷åí íà êàíàë %s."
@@ -2487,28 +1800,28 @@ msgstr "Äàííûå î áîòå %s áûëè èçìåíåíû íà %s!%s@%s (%s)"
 msgid "Bot %s has been deleted."
 msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Áîò %s óæå íàçíà÷åí íà êàíàë %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Ñ ıòîãî ìîìåíòà, áîò áóäåò êèêàòü îïåğàòîğîâ êàíàëà %s çà íàğóøåíèÿ."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Ñ ıòîãî ìîìåíòà áîò áóäåò êèêàòü âîéñîâ êàíàëà %s çà íàğóøåíèÿ."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr ""
 "Òåïåğü, îïåğàòîğû êàíàëà %s áóäóò èñêëş÷åíû èç óñëîâèé êèêà çà íàğóøåíèÿ."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Òåïåğü, âîéñû êàíàëà %s áóäóò èñêëş÷åíû èç óñëîâèé êèêà çà íàğóøåíèÿ."
@@ -2538,16 +1851,11 @@ msgstr "Óêàçàííûé äëÿ áîòà èäåíò ñîäåğæèò íåäîïóñòèìûå ñèìâîëû."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Óêàçàííûé äëÿ áîòà íèê ñîäåğæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Íà äàííûé ìîìåíò, áîò íå ïğèñóòñòâóåò íà êàíàëå %s."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Ñïèñîê áîòîâ:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2556,7 +1864,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2567,7 +1875,7 @@ msgstr ""
 "íàğóøèòåëş ïîñëå %d êèêà(îâ). Äëÿ ìîäèôèêàöèè ñïèñêà \"ïëîõèõ\" ñëîâ\n"
 "âîñïîëüçóéòåñü êîìàíäîé BADWORDS."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2575,7 +1883,7 @@ msgstr ""
 "Ğåæèì êèêà çà ïëîõèå ñëîâà àêòèâèğîâàí.\n"
 "Äëÿ ìîäèôèêàöèè ñïèñêà \"ïëîõèõ\" ñëîâ âîñïîëüçóéòåñü êîìàíäîé BADWORDS."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2584,11 +1892,11 @@ msgstr ""
 "Ğåæèì êèêà çà èñïîëüçîâàíèå æèğíîãî øğèôòà àêòèâèğîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå æèğíîãî øğèôòà àêòèâèğîâàí."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2600,7 +1908,7 @@ msgstr ""
 "ñèìâîëîâ è îíè ñîñòàâëÿşò íå ìåíåå %d%% îò îáùåãî êîë-âà ñèìâîëîâ.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2610,7 +1918,7 @@ msgstr ""
 "áóäåò êèêàòü ïîñåòèòåëÿ, åñëè åãî ôğàçà ñîäåğæèò íå ìåíåå %d áîëüøèõ\n"
 "ñèìâîëîâ è îíè ñîñòàâëÿşò íå ìåíåå %d%% îò îáùåãî êîë-âà ñèìâîëîâ."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2619,11 +1927,11 @@ msgstr ""
 "Ğåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèğîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèğîâàí."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2632,12 +1940,12 @@ msgstr ""
 "Ğåæèì êèêà çà ôëóä àêòèâèğîâàí (óñëîâèå: %d ëèíèé çà %d ñåêóíä).\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Ğåæèì êèêà çà ôëóä àêòèâèğîâàí (óñëîâèå: %d ëèíèé çà %d ñåêóíä)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2646,11 +1954,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2661,7 +1969,7 @@ msgstr ""
 "Áîò áóäåò êèêàòü ïîëüçîâàòåëÿ ïîñëå %d ïîâòîğîâ ïîäğÿä è ñòàâèòü\n"
 "áàí ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2670,7 +1978,7 @@ msgstr ""
 "Ğåæèì êèêà çà ÷ğåçìåğíûå ïîâòîğû àêòèâèğîâàí.  Áîò áóäåò êèêàòü\n"
 "ïîñåòèòåëÿ åñëè îí ïîâòîğèò îäíó è òó æå ôğàçó %d ğàç ïîäğÿä."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2679,11 +1987,11 @@ msgstr ""
 "Ğåæèì êèêà çà èñïîëüçîâàíèå èíâåğñíîãî òåêñòà àêòèâèğîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå èíâåğñíîãî òåêñòà àêòèâèğîâàí."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2692,16 +2000,16 @@ msgstr ""
 "Ğåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åğêíóòîãî òåêñòà àêòèâèğîâàí.\n"
 "Äîïîëíèòåëüíî, ïîñëå %d ïğåäóïğåæäàşùèõ êèêîâ, áîò çàáàíèò íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åğêíóòîãî òåêñòà àêòèâèğîâàí."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ àêòèâèğîâàí."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2710,182 +2018,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Ğåæèì êèêà çà ïëîõèå ñëîâà îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå æèğíîãî øğèôòà îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Ğåæèì êèêà çà ÷ğåçìåğíîå èñïîëüçîâàíèå CapsLOCK îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå öâåòîâ îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Ğåæèì êèêà çà ôëóä îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Ğåæèì êèêà çà ÷ğåçìåğíûå ïîâòîğû îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå èíâåğñíîãî òåêñòà îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Ğåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åğêíóòîãî òåêñòà îòêëş÷åí."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Ğåæèì êèêà çà ÷ğåçìåğíîå èñïîëüçîâàíèå CapsLOCK îòêëş÷åí."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ         : %6d çàïèñåé, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "Áîòû, çàğåçåğâèğîâàííûå äëÿ IRC-îïåğàòîğîâ:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Áàéò ñ÷èòàíî    : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Áàéò çàïèñàíî   : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {íèê | #êàíàë}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [òåêñò|íîìåğ]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+ñğîê_èñòå÷åíèÿ] {#êàíàë} [ïğè÷èíà]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK íèê"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES #êàíàë [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR #êàíàë ÷òî_èìåííî"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Îòìåíà ïîñëåäíåãî îòïğàâëåííîãî âàìè ìåìî-ñîîáùåíèÿ"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Óäàëåíèå êàíàëà èç áàçû äàííûõ ñåğâèñîâ"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Îòìåíà ğåãèñòğàöèè íèêà (óäàëåíèå)"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Íà äàííûé ìîìåíò îòïğàâêà email íåâîçìîæíà, ïîïğîáóéòå ïîçæå."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Ñïèñîê áîòîâ:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Ñïèñîê äîñòóïà äëÿ %s ïóñò."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "Ñïèñîê äîñòóïà äëÿ %s:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ        : %6d çàïèñåé, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Ğåæèìû ïîëüçîâàòåëÿ %s èçìåíåíû."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s ïğèíóäèòåëüíî èçìåíèë âàøè ïîëüçîâàòåëüñêèå ğåæèìû."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "Êàíàë %s íå ñóùåñòâóåò."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        âûáîğ ìåòîäà îáùåíèÿ ñåğâèñîâ ñ âàìè"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Ğåæèìû ïîëüçîâàòåëÿ %s èçìåíåíû."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "Êàíàë %s óäàëåí èç áàçû äàííûõ."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Êàíàë %s ÇÀÏĞÅÙÅÍ ê èñïîëüçîâàíèş %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "Êàíàë %s óæå çàğåãèñòğèğîâàí!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "Ñ ıòîãî ìîìåíòà êàíàë %s çàïğåùåí äëÿ èñïîëüçîâàíèÿ."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Êàíàë %s óñïåøíî âîññòàíîâëåí èç ğåæèìà ñàñïåíäà."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Àêòèâíîñòü êàíàëà %s ïğèîñòàíîâëåíà."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "Êàíàë %s íå çàğåãèñòğèğîâàí."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "Ğåãèñòğàöèÿ èëè èñïîëüçîâàíèå êàíàëà %s ÇÀÏĞÅÙÅÍÛ."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "Êàíàë %s íå ìîæåò áûòü çàğåãèñòğèğîâàí."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "Êàíàë %s óñïåøíî çàğåãèñòğèğîâàí íà íèê %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Êàíàëîâ         : %6d çàïèñåé, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "Ğåæèì èñòå÷åíèÿ ïî âğåìåíè äëÿ êàíàëà %s àêòèâèğîâàíà."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "Ñ ıòîãî ìîìåíòà, ğåãèñòğàöèÿ êàíàëà %s íèêîãäà íå èñòå÷åò."
@@ -2895,31 +2228,26 @@ msgstr "Ñ ıòîãî ìîìåíòà, ğåãèñòğàöèÿ êàíàëà %s íèêîãäà íå èñòå÷åò."
 msgid "Channel %s %s list has been cleared."
 msgstr "Ñïèñîê AOP'îâ êàíàëà %s áûë ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Ñïèñîê äîñòóïà êàíàëà %s áûë ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Ñïèñîê AKICK'îâ íà êàíàëå %s áûë ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Êàíàë %s óñïåøíî âîññòàíîâëåí èç ğåæèìà ñàñïåíäà."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Óêàçàíî íåäîïóñòèìîå èìÿ êàíàëà: %s"
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr "SQLINE-âîçìîæíîñòè ñåğâèñîâ â âàøåé ñåòè íåäîñòóïíû."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2927,7 +2255,7 @@ msgstr ""
 "Ñïèñîê êàíàëîâ:\n"
 "Èìÿ            Ïîñåòèòåëåé Ğåæèìû  Òîïèê"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2936,7 +2264,7 @@ msgstr ""
 "Êàíàëû, íà êîòîğûõ ó %s åñòü óğîâíè äîñòóïà:\n"
 "Íîìåğ  Êàíàë                Óğîâåíü  Îïèñàíèå"
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2944,16 +2272,49 @@ msgstr ""
 "Êàíàëû, íà êîòîğûõ ó âàñ åñòü óğîâíè äîñòóïà:\n"
 "Íîìåğ  Êàíàë                Óğîâåíü  Îïèñàíèå"
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr ""
+"    CHECK  Ïğîâåğêà íà òî, áûëî ëè ïğî÷èòàíî ïîñëåäíåå ïîñëàííîå âàìè "
+"ñîîáùåíèå"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Íàñòğîéêà ğàçëè÷íûõ îïöèé áîòà"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Íàñòğîéêà óñëîâèé KICK'à"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Ïîäòâåğæäåíèå ğåãèñòğàöèè êîäîì àóòåíôèêàöèè"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Î÷èñòêà âñåõ ğåæèìîâ óêàçàííîãî êàíàëà"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Èçâèíèòå, âîññòàíîâèòü àêòèâíîñòü êàíàëà %s íåóäàëîñü."
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Òåêóùèé ñïèñîê AKILL'îâ:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2961,15 +2322,15 @@ msgstr ""
 "Òåêóùèé ñïèñîê AKILL'îâ:\n"
 "  No.   Ìàñêà                             Ïğè÷èíà"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Òåêóùèé ñïèñîê ìîäóëåé:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Òåêóùèé ñïèñîê SNLINE'îâ:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2977,11 +2338,11 @@ msgstr ""
 "Òåêóùèé ñïèñîê SNLINE'îâ:\n"
 "  No.   Ìàñêà                             Ïğè÷èíà"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Òåêóùèé ñïèñîê SQLINE'îâ:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2989,11 +2350,11 @@ msgstr ""
 "Òåêóùèé ñïèñîê SQLINE'îâ:\n"
 "  No.   Ìàñêà                             Ïğè÷èíà"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Òåêóùèé ñïèñîê SZLINE'îâ:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -3002,7 +2363,7 @@ msgstr ""
 "  No.   Ìàñêà                             Ïğè÷èíà"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Òåêóùèé ñïèñîê èñêëş÷åíèé èç ëèìèòà ñåññèé:"
 
@@ -3026,56 +2387,61 @@ msgstr "Òåêóùåå êîëè÷åñòâî SQLINE'îâ          : %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Òåêóùåå êîëè÷åñòâî SZLINE'îâ          : %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Òåêóùåå êîë-âî ïîëüçîâàòåëåé: %d, IRC-îïåğàòîğîâ: %d "
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <íèê>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [#êàíàë] {íîìåğ_ñîîáùåíèÿ | ñïèñîê_çàïèñåé | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <íèê>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP #êàíàë"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Äåàêòèâèğóåò âàø òåêóùèé âèğòóàëüíûé õîñò"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3200,6 +2566,42 @@ msgstr "Âğåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèş : 1 ìèíóòà"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Âğåìÿ èñòå÷åíèÿ SZLINE'à ïî-óìîë÷àíèş : íèêîãäà"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr "    LOGONNEWS   Óïğàâëåíèå ñïèñêîì íîâîñòåé ïğè ïîäêëş÷åíèè"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr "    LOGONNEWS   Óïğàâëåíèå ñïèñêîì íîâîñòåé ïğè ïîäêëş÷åíèè"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr "    OPERNEWS    Óïğàâëåíèå ñïèñêîì îïåğ-íîâîñòåé"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr ""
+"    DEHALFOP   Ñíÿòèå ğåæèìà ïîëóîïåğàòîğà (-h) ñ óêàçàííîãî íèêà íà êàíàëå"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Óäàëåíèå ìåìî-ñîîáùåíèé"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Óäàëåíèå âèğò. õîñòà ó âñåõ íèêîâ óêàçàííîé ãğóïïû"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Óäàëåíèå âèğòóàëüíîãî õîñòà"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3210,7 +2612,7 @@ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà AOP'îâ êàíàëà %s."
 msgid "Deleted %d entries from %s access list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà àêòîêèêîâ êàíàëà %s."
@@ -3250,7 +2652,7 @@ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SZLINE'îâ."
 msgid "Deleted 1 entry from %s access list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà äîñòóïà êàíàëà %s."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà àâòîêèêîâ êàíàëà %s."
@@ -3285,32 +2687,75 @@ msgstr "Óäàëåíà 1 çàïèñü èç ñïèêà SZLINE'îâ."
 msgid "Deleted one entry from %s %s list."
 msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà AOP'îâ êàíàëà %s."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr ""
+"    DEOP       Ñíÿòèå ğåæèìà îïåğàòîğà (-o) ñ óêàçàííîãî íèêà íà êàíàëå"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Ñíÿòèå ğåæèìà çàùèòû (+a) ñ óêàçàííîãî íèêà íà êàíàëå"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "Îïèñàíèå êàíàëà %s èçìåíåíî íà %s."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "îòêëş÷åí"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Ñíÿòèå ğåæèìà âîéñà (-v) ñ óêàçàííîãî íèêà íà êàíàëå"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Îòêëş÷åíèå \"ìåğòâîé\" IRC-ñåññèé ñ âàøèì íèêîì"
+
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Ñïèñîê âñåõ ïğîïèñàííûõ íà ñåğâèñàõ è èõ îíëàéí-ñòàòóñ"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Êîíåö ñïèñêà õîñòîâ, çàïèñåé íàñ÷èòàíî: %d"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Êîíåö ñïèñêà çàïèñåé ñ %d ïî %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Êîíåö ñïèñêà õîñòîâ ïî ìàñêå %s, çàïèñåé íàñ÷èòàíî: %d"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Èíôîğìàöèÿ î êàêîì-ëèáî íèêå"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Èíôîğìàöèÿ î êîë-âå ñîîáùåíèé è íàñòğîéêàõ îïîâåùåíèÿ"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Âûâîä ñïèñêà âñåõ âèğòóàëüíûõ õîñòîâ"
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Èíôîğìàöèÿ î êîë-âå ñîîáùåíèé è íàñòğîéêàõ îïîâåùåíèÿ"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3339,169 +2784,208 @@ msgstr "Ñëîâî %s çàïğåùåíî íà ıòîì êàíàëå!"
 msgid "Don't use underlines on this channel!"
 msgstr "Èñïîëüçîâàíèå ïîä÷åğêèâàíèé ó íàñ òóò íå ïğèâåòñòâóåòñÿ!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Email-àäğåñ äëÿ %s èçìåíåí íà %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Email-àäğåñ äëÿ %s óäàëåí."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "Email-àäğåñ äëÿ %s íåêîğğåêòåí."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD|DEL|MOVE|LIST|VIEW} [ïàğàìåòğû]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Íàéäåíî ñîîòâåòñòâèå äëÿ íèêà %s: %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "âêëş÷åí"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "Êîíåö ñïèñêà %s."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "Êîíåö ñïèñêà äîñòóïà."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Êîíåö ñïèñêà êàíàëîâ."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Êîíåö ñïèñêà - %d/%d êàíàëîâ ïîêàçàíî."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Êîíåö ñïèñêà - %d/%d çàïèñåé ïîêàçàíî."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Êîíåö ñïèñêà ïîëüçîâàòåëåé."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Ğóññêèé"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Îøèáêà: äëèíà óêàçàííîãî âèğòóàëüíîãî èäåíòà ïğåâûøàåò ïîğîã â %d ñèìâîëîâ."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Ïåğåçàãğóçêà êîíôèãóğàöèîííîãî ôàéëà ñåğâèñîâ"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Îøèáêà: äëèíà óêàçàííîãî âèğòóàëüíîãî õîñòà ïğåâûøàåò ïîğîã â %d ñèìâîëîâ."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "Èñêëş÷åíèå äëÿ %s (#%d) ïåğåìåùåíî â ïîçèöèş %d."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Ëèìèò ñåññèé äëÿ çàïèñè âèäà %s áûë èçìåíåí íà %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Ğåãèñòğàöèÿ èñòåêàåò....: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "Ñğîê èñòå÷åíèÿ çàïèñè %s óñïåøíî èçìåíåí."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID #êàíàë ïğè÷èíà"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID #êàíàë [ïğè÷èíà]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID íèê ïğè÷èíà"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID íèê [ïğè÷èíà]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "FANTASY-ğåæèì"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "FANTASY-ğåæèì äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "FANTASY-ğåæèì äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "Íèê %s óñïåøíî óäàëåí èç ñïèñêà èãíîğèğîâàíèÿ."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "Ìàñêà âèäà %s óæå ïğèñóòñòâóåò â âàøåì ñïèñêå äîñòóïà."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr "    UPDATE      Îáíîâëåíèå áàç äàííûõ ñåğâèñîâ (ñîõğàíåíèå íà äèñê)"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Ïğèíóäèòåëüíîå èçìåíåíèå íèêà ïîëüçîâàòåëÿ ñåòè"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Çàïğîñ ïàğîëÿ îò íèêà íà email-àäğåñ"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "Âñå ïğàâà íà âëàäåíèå êàíàëîì %s óñïåøíî ïåğåäàíû ïîëüçîâàòåëş %s."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL ëîãèí@email-õîñò.tld (ñèìâîëüíûå ìàñêè çàïğåùåíû!!)"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY #êàíàë"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS íèê"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "Êîìàíäà GETPASS íåäîñòóïíà, òàê êàê âêëş÷åíî øèôğîâàíèå ïàğîëåé."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST íèê [ïàğîëü]"
 
@@ -3509,11 +2993,27 @@ msgstr "GHOST íèê [ïàğîëü]"
 msgid "GLOBAL message"
 msgstr "GLOBAL ñîîáùåíèå"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Ñåññèÿ ñ âàøèì çàâèñøèì íèêîì óñïåøíî çàêğûòà."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Óñòàíîâêà îïåğôëàãîâ óêàçàííîìó ïîëüçîâàòåëş ñåòè"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr ""
+"    OP         Óñòàíîâêà ñòàòóñà îïåğàòîğà (+o) óêàçàííîìó íèêó íà êàíàëå"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Çàïğîñ ñòàòóñà âëàäåëüöà íà êàíàëå"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Ïğèâåòñòâèÿ"
 
@@ -3521,82 +3021,161 @@ msgstr "Ïğèâåòñòâèÿ"
 msgid "Greet message displayed"
 msgstr "Óğîâåíü äîñòóïà ê èñïîëüçîâàíèş ïğèâåòñòâåííîãî ñîîáùåíèÿ"
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Ïğèâåòñòâèå äëÿ %s èçìåíåíî íà %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Ïğèâåòñòâèå äëÿ %s óäàëåíî."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now off on channel %s."
 msgstr "Ğåæèì ïğèâåòñòâèé äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/bs_set.cpp:119
+#, fuzzy, c-format
+msgid "Greet mode is now on on channel %s."
+msgstr "Ğåæèì ïğèâåòñòâèé äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr ""
+"    HALFOP     Óñòàíîâêà ñòàòóñà ïîëóîïåğàòîğà (+h) óêàçàííîìó íèêó íà êàíàëå"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       ñêğûòèå ğàçëè÷íîé èíôîğìàöèè î âàøåì íèêå"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       ñêğûòèå êàíàëà â ñïèñêå êàíàëîâ âûâîäèìûõ ïî LIST"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "Ñïèñîê õîñòîâ ñ êîëè÷åñòâîì ñåññèé %d è áîëåå:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY ïàğîëü"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [âğåìÿ] [íèê]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO #êàíàë"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO íèê"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {#êàíàë | íèê}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE #êàíàë"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Èäåíòèôèêàöèÿ ê íèêó â êà÷åñòâå âëàäåëüöà"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr ""
 "Åñëè âû íå âûïîëíèòå óêàçàííûå ğåêîìåíäàöèè, âàø íèê áóäåò ïğèíóäèòåëüíî "
 "èçìåíåí â òå÷åíèè 20 ñåêóíä."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr ""
 "Åñëè âû íå âûïîëíèòå óêàçàííûå ğåêîìåíäàöèè, âàø íèê áóäåò ïğèíóäèòåëüíî "
 "èçìåíåí â òå÷åíèè ìèíóòû."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ñïèñîê èãíîğèğóåìûõ íèêîâ ïîëíîñòüş î÷èùåí."
@@ -3605,12 +3184,13 @@ msgstr "Ñïèñîê èãíîğèğóåìûõ íèêîâ ïîëíîñòüş î÷èùåí."
 msgid "Ignore list is empty."
 msgstr "Ñïèñîê èãíîğèğóåìûõ íèêîâ ïóñò."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Ñïèñîê áîòîâ:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3626,25 +3206,17 @@ msgstr ""
 "èäåíòèôèöèğîâàòüñÿ  ê  íèêó  â  êà÷åñòâå åãî âëàäåëüöà. Äëÿ áîëåå\n"
 "ïîäğîáíîé èíôîğìàöèè ñì. /msg %s HELP IDENTIFY"
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Çàäàí íåâåğíûé äèàïàçîí. Ñèíòàêñèñ: #îòêóäà-äîêóäà."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Èíôîğìàöèÿ î çàãğóæåííîì ìîäóëå"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "Èíôîğìàöèÿ î áîòå %s:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "Èíôîğìàöèÿ î êàíàëå %s:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Óêàçàíî íåâåğíîå çíà÷åíèå ñğîêà èñòå÷åíèÿ."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
@@ -3652,14 +3224,11 @@ msgstr ""
 "Óêàçàíà íåêîğğåêòíàÿ õîñòìàñêà. Òîëüêî ğåàëüíûé õîñò, íå ñîäåğæàùèé íèêîâ è "
 "èäåíòîâ ïîëüçîâàòåëåé, ìîæåò áûòü äîáàâëåí â ñïèñîê èñêëş÷åíèÿ."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Áûë ââåäåí íåâåğíûé auth-êîä, ïîæàëóéñòà, ïğîâåğüòå âàø e-mail ñíîâà è "
-"ïîïğîáóéòå åùå ğàç."
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3668,7 +3237,7 @@ msgstr ""
 "Íåêîğğåêòíîå çíà÷åíèå ëèìèòà. Îíî äîëæíî áûòü öåëûì ÷èñëîì, áîëüøå èëè "
 "ğàâíûì íóëş, è ìåíüøå %d."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr ""
 "Íåêîğğåêòíîå çíà÷åíèå äëÿ ïîğîãà ñåññèé.  êà÷åñòâå ïàğàìåòğà äîëæíî áûòü "
@@ -3678,12 +3247,17 @@ msgstr ""
 msgid "JUPE servername [reason]"
 msgstr "JUPE èìÿ_ñåğâåğà [ïğè÷èíà]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Îáúåäèíåíèå íèêîâ â ãğóïïû"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK #êàíàë îïöèÿ {ON|OFF} [ïàğàìåòğû]"
@@ -3692,272 +3266,447 @@ msgstr "KICK #êàíàë îïöèÿ {ON|OFF} [ïàğàìåòğû]"
 msgid "KICK channel user reason"
 msgstr "KICK #êàíàë íèê ïğè÷èíà"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Êèêíóòü ïîëüçîâàòåëÿ ñ êàíàëà ïîñğåäñòâîì ñåğâèñîâ"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Âûêèäûâàåò óêàçàííîãî ïîëüçîâàòåëÿ ñ êàíàëà"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr ""
+"    RECOVER    Îñâîáîæäåíèå âàøåãî íèêà îò èñïîëüçîâàíèÿ åãî êåì-òî äğóãèì"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS #êàíàë {SET | DIS[ABLE] | LIST | RESET} [ïóíêò [óğîâåíü]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST ìàñêà"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST ìàñêà [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [#êàíàë] [ñïèñîê_çàïèñåé | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP ãëàâíûé_íèê ïàğîëü"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [òåêñò|íîìåğ]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "ßçûê ñåğâèñîâ èçìåíåí íà Ğóññêèé."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "Ïîñëåäíåå âàøå ñîîáùåíèå àäğåñàòó %s óñïåøíî îòìåíåíî."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "Ïîñëåäíåå quit-ñîîáùåíèå: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "Ïîñëåäíÿÿ ìàñêà.........: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "Óğîâåíü äîñòóïà ê %s íà êàíàëå %s èçìåíåí íà %d."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Óğîâåíü äîëæåí áûòü ÷èñëîì ìåæäó %d è %d âêëş÷èòåëüíî."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr ""
 "Ñèñòåìà óğîâíåé íå äîñòóïíà, òàê êàê èñïîëüçóåòñÿ ñèñòåìà ïğèâèëåãèé xOP."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "Ñïèñîê íèêîâ ïî ìàñêå %s:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr "    LIST       Ñïèñîê âñåõ çàğåãèñòğèğîâàííûõ íèêîâ ïî ìàñêå"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      Âûâîä ñïèñêà êàíàëîâ, íà êîòîğûõ ó âàñ åñòü äîñòóï"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     Ñïèñîê çàãğóæåííûõ ìîäóëåé"
+
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Ñïèñîê íèêîâ â ãğóïïå %s:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Ñïèñîê íèêîâ â âàøåé ãğóïïå:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Ñïèñîê âàøèõ ìåìî-ñîîáùåíèé"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Ñïèñîê òåêóùèõ àêòèâíûõ êàíàëîâ ñåòè"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Ñïèñîê íèêîâ â âàøåé ãğóïïå:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr "    LIST       Çàïğîñ ñïèñêà âñåõ çàğåãèñòğèğîâàííûõ êàíàëîâ"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Ñïèñîê òåêóùèõ ïîëüçîâàòåëåé ñåòè"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Ñïèñîê äîñòóïíûõ äëÿ óñòàíîâêè áîòîâ"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Çàïğîñ èíôîğìàöèè îá óêàçàííîì êàíàëå"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Çàãğóçèòü ìîäóëü"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Ëîêàëüíûå êàíàëû íå ìîãóò áûòü çàğåãèñòğèğîâàíû."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Íîâîñòü ïîä íîìåğîì #%d óäàëåíà."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Íîâîñòü ïîä íîìåğîì #%d íå îáíàğóæåíà."
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Òåêóùèå ñïèñîê íîâîñòåé:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE #êàíàë ğåæèìû"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO èìÿ_ôàéëà"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD èìÿ_ôàéëà"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD èìÿ_ôàéëà"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD èìÿ_ôàéëà"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Óïğàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Óïğàâëåíèå ñïèñêîì \"ïëîõèõ\" ñëîâ"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Óïğàâëåíèå ñåğâèñíûìè áîòàìè"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Óïğàâëåíèå ñïèñêîì HOP'îâ êàíàëå"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Óïğàâëåíèå ñïèñêîì VOP'îâ êàíàëà"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr "ACT                Âûïîëíèòü äåéñòâèå îò ëèöà áîòà íà óêàçàííîì êàíàëå"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr "SAY                Ïîñëàòü íà óêàçàííûé êàíàë òåêñò îò ëèöà áîòà"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Óïğàâëåíèå ñïèñêîì àâòîêèêîâ êàíàëà"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Óïğàâëåíèå èãíîğ-ñïèñêîì ñåğâèñîâ"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       Óïğàâëåíèå ñïèñêîì AKILL'îâ"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Óïğàâëåíèå ñèñòåìîé DefCon (çàùèòíûõ êîíòğìåğ)"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      Óïğàâëåíèå ñïèñêîì SNLINE'îâ"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      Óïğàâëåíèå ñïèñêîì SQLINE'îâ"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      Óïğàâëåíèå ñïèñêîì SZLINE'îâ"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Óñòàíîâêà òîïèêà íà êàíàëå ïîñğåäñòâîì ñåğâèñîâ"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "Ìàñêà âèäà %s óæå ïğèñóòñòâóåò â âàøåì ñïèñêå äîñòóïà."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Ìàñêà äîëæíà áûòü ñòğîãî â ôîğìàòå èäåíò@õîñò."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr "    GETEMAIL   Çàïğîñ ñïèñêà âñåõ íèêîâ ñ óêàçàííûì email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Çàôèêñèğîâàííûé ìàêñèìóì ïîëüçîâàòåëåé: %d (íà %s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr ""
 "Ñîîáùåíèå %d îò %s (%s). ×òîáû óäàëèòü åãî, íàïèøèòå êîìàíäó: /msg %s DEL %d"
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr ""
 "Ñîîáùåíèå %d îò %s (%s). ×òîáû óäàëèòü åãî, íàïèøèòå êîìàíäó: /msg %s DEL %s "
 "%d"
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "Ñîîáùåíèå ïîä íîìåğîì %d áûëî óäàëåíî."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s îòêëş÷åí."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "Ëèìèò ñîáùåíèé äëÿ %s óñòàíîâëåí íà %d."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s óñòàíîâëåí íà 0."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr ""
-"Óêàçàííîå çíà÷åíèå ëèìèòà ÷åğåñ÷óğ âåëèêî è áóäåò ïğèíóäèòåëüíî èçìåíåíî äî %"
-"d."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Ìåìî-ñîîáùåíèå äëÿ %s óñïåøíî îòïğàâëåíî."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr ""
 "Ñïèñîê ñîîáùåíèé äëÿ %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåğ"
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr ""
 "Ñîîáùåíèÿ êàíàëà %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ %s íîìåğ"
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr ""
-"Ñïèñîê ñîîáùåíèé äëÿ %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåğ"
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr ""
 "Ñîîáùåíèÿ êàíàëà %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ %s íîìåğ"
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Ğåæèì ïğèâàòíûõ ñîîáùåíèé"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "Áëîêèğîâêà ğåæèìîâ........: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Óïğàâëåíèå èãíîğ-ñïèñêîì ñåğâèñîâ"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        Óïğàâëåíèå ñïèñêîì AOP'îâ êàíàëà"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        Óïğàâëåíèå ñïèñêîì SOP'îâ êàíàëà"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     Óïğàâëåíèå ACCESS-ñïèñêîì íèêà (ñïèñêîì õîñòìàñîê)"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Óïğàâëåíèå ACCESS-ñïèñêîì ïğèâèëåãèé êàíàëà"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Óïğàâëåíèå ñïèñêîì èñêëş÷åíèé èç ëèìèòà ñåññèé"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Ìîäóëü %s óñïåøíî çàãğóæåí."
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Ìîäóëü %s óñïåøíî çàãğóæåí."
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Ìîäóëü %s óñïåøíî âûãğóæåí."
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Ìîäóëü: %s Âåğñèÿ: %s Àâòîğ: %s Çàãğóæåí: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Ìîäóëü: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} ñåğâåğ"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS-àëèàñîâ      : %6d çàïèñåé, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS-ãğóïï        : %6d çàïèñåé, %5d kB"
@@ -3970,12 +3719,14 @@ msgstr "Óğîâåíü äîñòóïà, èñêëş÷àşùèé îáëàäàòåëÿ èç óñëîâèé êèêîâ áîòà"
 msgid "New memo"
 msgstr "Íîâîå ìåìî-ñîîáùåíèå"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr ""
 "Íîâûå ñîîáùåíèÿ äëÿ %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ íîìåğ"
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr ""
 "Íîâûå ñîîáùåíèÿ íà êàíàëå %s. ×òîáû ïğî÷åñòü èõ, íàïèøèòå: /msg %s READ %"
@@ -3985,142 +3736,108 @@ msgstr ""
 msgid "News list is full!"
 msgstr "Ñïèñîê íîâîñòåé ïåğåïîëíåí."
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"Íèê %s áûë çàïğåùåí ê èñïîëüçîâàíèş %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "Íèê %s óñïåøíî óäàëåí èç áàçû äàííûõ ñåğâèñîâ."
+
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "Íèê %s óæå çàğåãèñòğèğîâàí!"
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Óêàçàííûé íèê %s ñîäåğæèò íåäîïóñòèìûå ñèìâîëû."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Íèê %s íà äàííûé ìîìåíò èñïîëüçóåòñÿ êåì-òî äğóãèì."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "Ñ ıòîãî ìîìåíòà íèê %s çàïğåùåí ê èñïîëüçîâàíèş."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Íèê %s ÿâëÿåòñÿ íèêîì îäíîãî èç ñåğâèñíûõ ïñåâäîêëèåíòîâ äàííîé ñåòè."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "Íà äàííûé ìîìåíò, íèê %s ñåğâèñàìè íå óäåğæèâàåòñÿ."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "Íèê %s â ñåòè íå îáíàğóæåí."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "Íèê %s íåçàğåãèñòğèğîâàí."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "Íèê %s íå ìîæåò áûòü çàğåãèñòğèğîâàí èëè èñïîëüçîâàí."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "Íèê %s â ñïèñêå èãíîğèğóåìûõ íå îáíàğóæåí."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Íèê %s áûë óñå÷åí äî %d ñèìâîëîâ."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "C ıòîãî ìîìåíòà íèê %s ñíîâà â ğåæèìå èñòå÷åíèÿ."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Ñ ıòîãî ìîìåíòà ğåãèñòğàöèÿ íèêà %s íèêîãäà íå èñòå÷åò."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Íèê %s íå ïîëó÷àë îò âàñ íèêàêèõ ñîîáùåíèé."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "Íèê %s óñïåøíî äåèäåíòèôèöèğîâàí."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Íèê %s íàõîäèòñÿ â ğåæèìå ñàñïåíäà."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Ğåæèì ñàñïåíäà ñ íèêà %s óñïåøíî ñíÿò."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Ñ ıòîãî ìîìåíòà íèê %s íàõîäèòñÿ ğåæèìå ñàñïåíäà."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Íèê ÍÅ çàğåãèñòğèğîâàí, ïîïğîáóéòå, ïîæàëóéñòà, ïîçæå."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Ğåãèñòğàöèÿ íèêà %s ïîäòâåğæäåíà."
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "Íèê %s óñïåøíî óäàëåí èç áàçû äàííûõ ñåğâèñîâ."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "Íèê %s óæå çàğåãèñòğèğîâàí!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "Íèê %s íå ìîæåò áûòü çàğåãèñòğèğîâàí."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr ""
 "Íèê %s óñïåøíî çàğåãèñòğèğîâàí, â ACCESS-ñïèñîê äîáàâëåíà õîñòìàñêà: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Íèê %s óñïåøíî çàğåãèñòğèğîâàí."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Ğåãèñòğàöèÿ íèêà %s"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4131,26 +3848,36 @@ msgstr ""
 "àâòîìàòè÷åñêè óäàëÿşòñÿ èç áàçû äàííûõ. Ñğîê ñóùåñòâîâàíèÿ íåàêòèâíûõ\n"
 "íèêîâ: %d äíåé."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
+#, fuzzy, c-format
+msgid "No Bot mode is now off on channel %s."
+msgstr "Ğåæèì áåç-áîòà äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/bs_set.cpp:136
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now on on channel %s."
 msgstr "Ğåæèì áåç-áîòà äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "Íèêè ñ email-àäğåñîì %s íå îáíàğóæåíû."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Áåç áîòîâ"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "íèêîãäà íå èñòå÷åò"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "Ñïğàâî÷íàÿ èíôîğìàöèÿ ïî %s îòñóòñòâóåò."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "Èíôîğìàöèÿ î ìîäóëå %s íåäîñòóïíà. "
@@ -4165,13 +3892,13 @@ msgid "No matching entries on %s %s list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé â ñïèñêå AOP'îâ êàíàëà %s íå îáíàğóæåíî."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé â ñïèñêå äîñòóïà êàíàëà %s íå îáíàğóæåíî."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Ñîâïàäàşùèõ çíà÷åíèé â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàğóæåíî."
@@ -4182,40 +3909,44 @@ msgstr "Ñîâïàäàşùèõ çíà÷åíèé â ñïèñêå àâòîêèêîâ êàíàëà %s íå îáíàğóæåíî."
 msgid "No matching entries on %s bad words list."
 msgstr "Â ñïèñêå ïëîõèõ ñëîâ êàíàëà %s ñîâïàäàşùèõ çàïèñåé íå îáíàğóæåíî."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr ""
 "Ñîâïàäàşùèõ çíà÷åíèé â ñïèñêå èñêëş÷åíèé èç ëèìèòà ñåññèé íå îáíàğóæåíî."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé íå îáíàğóæåíî."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé íå îáíàğóæåíî."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé íå îáíàğóæåíî."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "Ñîâïàäàşùèõ çàïèñåé íå îáíàğóæåíî."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "Íåò ñîîáùåíèé äîñòóïíûõ äëÿ îòìåíû."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "Ñïèñîê ìîäóëåé ïóñò."
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Ñïèñîê îïåğ-íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
@@ -4224,16 +3955,12 @@ msgstr "Ñïèñîê îïåğ-íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
 msgid "No random news items to delete!"
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïóñò, óäàëÿòü íå÷åãî."
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Íåò ïğè÷èíû"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Óğîâåíü äîñòóïà, èñêëş÷àşùèé ïîïàäàíèå ïîä óñëîâèÿ SIGNKICK"
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "îòñóòñòâóşò"
 
@@ -4241,7 +3968,7 @@ msgstr "îòñóòñòâóşò"
 msgid "Not allowed to join channel"
 msgstr "Óğîâåíü äîñòóïà, çàïğåùàşùèé çàõîäèòü íà êàíàë"
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4253,28 +3980,28 @@ msgstr ""
 "íå ïîñåòèò êàíàë â òå÷åíèè äàííîãî âğåìåíè), áóäåò àâòîìàòè÷åñêè\n"
 "óäàëåí èç áàçû äàííûõ ñåğâèñîâ."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Íîìåğ  Ëèìèò  Õîñò"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE íèê +ôëàãè"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OP-óâåäîìëåíèå"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [òåêñò|íîìåğ]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4283,13 +4010,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Ñòàğàÿ èíôîğìàöèÿ î áîòå íå îòëè÷àåòñÿ îò íîâîé."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "Ñòàòóñ Óğîâåíü Íèê"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now off."
+msgstr "Ğåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_opnotice.cpp:33
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now on."
 msgstr "Ğåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s àêòèâèğîâàí."
 
 #: modules/core/os_news.cpp:55
@@ -4298,133 +4030,96 @@ msgid "Oper news item #%d deleted."
 msgstr "Íîâîñòü ïîä íîìåğîì #%d óäàëåíà."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Íîâîñòü ïîä íîìåğîì #%d íå îáíàğóæåíà."
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Ñïèñîê íîâîñòåé äëÿ IRC-îïåğàòîğîâ:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ        : %6d çàïèñåé, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "OLINE-ôëàãè %s óñïåøíî óñòàíîâëåíû äëÿ ñåññèé ïîëüçîâàòåëÿ %s"
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Íå êèêàòü îïåğàòîğîâ"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Âîçìîæíîñòü íàñòğîéêè îïöèè %s â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Ïàğîëü äëÿ íèêà %s - %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Ïàğîëü ïğèíÿò - âû ïğèçíàíû êàê âëàäåëåö íèêà."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Äëÿ âûïîëíåíèÿ äàííîé êîìàíäû âû äîëæíû èäåíòèôèöèğîâàòüñÿ.\n"
-"Ïîïğîáóéòå ñíîâà ïîñëå òîãî, êàê èñïîëüçóåòå êîìàíäó /msg %s IDENTIFY ïàğîëü."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Ïàğîëü äëÿ %s èçìåíåí íà %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Ïàğîëü äëÿ %s óñïåøíî èçìåíåí."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Âû óêàçàëè íåâåğíûé ïàğîëü."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "Ïàğîëü äëÿ íèêà %s - %s"
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Âû óêàçàëè íåâåğíûé ïàğîëü."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "Ïàğîëü äëÿ íèêà %s áûë âûñëàí íà åãî email-àäğåñ."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Ñïîêîéñòâèå"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Ğåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Ğåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Âèğòóàëüíûé õîñò äëÿ âàøåãî íèêà îòñóòñòâóåò."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Ïîæàëóéñòà, ïîïğîáóéòå ñíîâà ñ áîëåå ñëîæíûì ïàğîëåì. Îí äîëæåí èìåòü äëèíó "
-"íå ìåíåå 5 ñèìâîëîâ, ñîñòîÿòü òîëüêî èç ëàòèíñêèõ áóêâ èëè öèôğ, íå áûòü "
-"ëåãêî îòãàäûâàåìûì (ò.å. Âàøèì èìåíåì èëè Âàøèì íèêîì), è íå äîëæåí "
-"ñîäåğæàòü ïğîáåëîâ è òàáóëÿöèé."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr ""
 " êà÷åñòâå îñíîâíîãî ïàğàìåòğà âû äîëæíû óêàçàòü ğåàëüíîå èìÿ ñåğåâåğà "
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Âû äîëæíû óêàçàòü ñèìâîë # ïåğåä íàçâàíèåì êàíàëà."
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä è ïîâòîğèòå çàïğîñ."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Ïîäîæäèòå %d ñåêóíä ïåğåä ïîâòîğíûì èñïîëüçîâàíèåì êîìàíäû GROUP."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Ïîäîæäèòå %d ñåêóíä ïåğåä ïîâòîğíûì èñïîëüçîâàíèåì êîìàíäû REGISTER."
@@ -4441,63 +4136,120 @@ msgid "Please wait %d seconds before using the SEND command again."
 msgstr ""
 "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä ïåğåä ïîâòîğíûì èñïîëüçîâàíèåì êîìàíäû SEND."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Óñòàíîâêà çàïğåòà íà èñïîëüçîâàíèå/ğåãèñòğàöèş êàíàëà"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Ïğèîñòàíîâêà ğàáîòû êàíàëà, ñ ñîõğàíåíèåì âñåõ äàííûõ\n"
+"               è íàñòğîåê êàíàëà"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr "    PRIVATE    ñêğûòèå íèêà â ñïèñêå íèêîâ ïî /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   óñòàíîâêà íà íèê ò.í. ğåæèìà 'íå-èñòå÷åíèÿ'"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Óñòàíîâêà çàïğåòà íà èñïîëüçîâàíèå/ğåãèñòğàöèş íèêà"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Ïğèâàòíîñòü"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "Áîò ïîä íèêîì %s óñïåøíî ïîìå÷åí êàê ïğèâàòíûé."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private mode of bot %s is now on."
+msgstr "Áîò ïîä íèêîì %s óñïåøíî ïîìå÷åí êàê ïğèâàòíûé."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
+msgstr "Ğåæèì ïğèâàòíîñòè êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_private.cpp:33
+#, fuzzy, c-format
+msgid "Private option for %s is now on."
 msgstr "Ğåæèì ïğèâàòíîñòè êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/ns_set_private.cpp:41
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option is now off for %s."
 msgstr "Ğåæèì ïğèâàòíîñòè äëÿ %s àêòèâèğîâàí."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
+msgstr "Ğåæèì ïğèâàòíîñòè äëÿ %s àêòèâèğîâàí."
+
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Çàùèòà"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Çàùèòà íèêà %s àêòèâèğîâàíà, ëèìèò âğåìåíè íà ââîä ïàğîëÿ: 60 ñåêóíä."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Çàùèòà íèêà %s àêòèâèğîâàíà,ëèìèò âğåìåíè íà ââîä ïàğîëÿ: 20 ñåêóíä."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Çàùèòà íèêà %s àêòèâèğîâàíà, ëèìèò âğåìåíè íà ââîä ïàğîëÿ: 0 ñåêóíä."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Çàùèòà íèêà %s àêòèâèğîâàíà, ëèìèò âğåìåíè íà ââîä ïàğîëÿ: 60 ñåêóíä."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Óñòàíîâêà ğåæèìà çàùèòû (+a) óêàçàííîìó íèêó íà êàíàëå"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Ïğåäîñòàâëÿåìàÿ êîìàíäà: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [òåêñò|íîìåğ]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [#êàíàë] {ñïèñîê_çàïèñåé | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER íèê [ïàğîëü]"
 
@@ -4505,15 +4257,15 @@ msgstr "RECOVER íèê [ïàğîëü]"
 msgid "REGISTER channel description"
 msgstr "REGISTER #êàíàë îïèñàíèå"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE íèê [ïàğîëü]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {íèê | #êàíàë} òåêñò"
 
@@ -4523,290 +4275,366 @@ msgid "Random news item #%d deleted."
 msgstr "Íîâîñòü ïîä íîìåğîì #%d óäàëåíà."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "Íîâîñòü ïîä íîìåğîì #%d íå îáíàğóæåíà."
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   ×òåíèå êàêîãî-ëèáî ñîîáùåíèÿ, ãğóïïû ñîîáùåíèé"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Ïåğåóñòàíîâêà çíà÷åíèÿ óğîâíåé äîñòóïà êàíàëà"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
 msgstr ""
-"Âğåìÿ ïåğâîé ÷àñòè ğåãèñòğàöèè èñòåêëî, âîñïîëüçóéòåñü êîìàíäîé \"/msg %s "
-"register <ïàğîëü> <email>\""
+"    RELEASE    Ñíÿòèå çàùèòû ñåğâèñîâ ñ âàøåãî íèêà ïîñëå êîìàíäû RECOVER"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Ğåãèñòğàöèÿ íèêà"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Ğåãèñòğàöèÿ íèêà"
+
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         àêòèâèğîâàíèå ğåæèìà \"ñïîêîéñòâèÿ\" íà êàíàëå"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Ñíÿòèå ğåæèìà ñàñïåíäà ñ êàíàëà (âîññòàíîâëåíèå)"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Çàãğóçèòü ìîäóëü"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Ïåğåçàãğóçêà êîíôèãóğàöèîííîãî ôàéëà ñåğâèñîâ"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Ñíèìàåò ñ âàñ ñòàòóñ âëàäåëüöà êàíàëà"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    îãğàíè÷åíèå óğîâíÿ äîñòóïà íà êàíàë äî ïğîïèñàííûõ"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Îãğàíè÷åííûé äîñòóï"
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now off."
+msgstr "Ğåæèì îãğàíè÷åííîãî äîñòóïà íà êàíàë %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_restricted.cpp:34
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now on."
 msgstr "Ğåæèì îãğàíè÷åííîãî äîñòóïà íà êàíàë %s àêòèâèğîâàí."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     àêòèâèğîâàíèå àâòîñîõğàíåíèÿ òîïèêà êàíàëà"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr "    GETPASS    Çàïğîñ ïàğîëÿ óêàçàííîãî íèêà"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr ""
+"    STATUS     Âîçâğàùàåò òåêóùèé óğîâåíü äîñòóïà äëÿ óêàçàííîãî\n"
+"               ïîëüçîâàòåëÿ íà óêàçàííîì êàíàëå"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Çàïğîñ óñòàíîâëåííîãî íà êàíàëå êëş÷à (+k)"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr ""
+"    STATUS     Çàïğîñ ñòàòóñà èäåíòèôèêàöèè óêàçàííîãî íèêà íà ñåğâèñàõ"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Äåèäåíòèôèêàöèÿ îò èñïîëüçóåìîãî íà äàííûé ìîìåíò íèêà"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SASET íèê MSG {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET íèê îïöèÿ ïàğàìåòğû"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET íèê AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET íèê KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET íèê KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET íèê LANGUAGE íîìåğ"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET íèê NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET íèê PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET íèê SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET íèê HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY #êàíàë òåêñò"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {íèê | #êàíàë} òåêñò_ñîîáùåíèÿ"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS íèê"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "Êîìàíäà SENDPASS íåäîñòóïíà, òàê êàê âêëş÷åíî øèôğîâàíèå ïàğîëåé."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST ëèìèò"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <íèê> <õîñòìàñêà>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET (#êàíàë | áîò) îïöèÿ ïàğàìåòğ"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET #êàíàë NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET íèê_áîòà PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET #êàíàë îïöèÿ ïàğàìåòğ"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET #êàíàë DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET #êàíàë DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET #êàíàë FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET #êàíàë GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET #êàíàë KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET #êàíàë OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET #êàíàë NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET #êàíàë OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET #êàíàë PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET #êàíàë PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET #êàíàë RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET #êàíàë SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET #êàíàë SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET #êàíàë SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET #êàíàë SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET #êàíàë SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET #êàíàë TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET #êàíàë XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET îïöèÿ ïàğàìåòğû"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET îïöèÿ ïàğàìåòğû"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE íîìåğ"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [#êàíàë] ïğåäåë"
 
@@ -4814,7 +4642,7 @@ msgstr "SET LIMIT [#êàíàë] ïğåäåë"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [íèê | #êàíàë] {ïğåäåë | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET MSG {ON | OFF}"
 
@@ -4822,24 +4650,24 @@ msgstr "SET MSG {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <íèê> <õîñòìàñêà>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "Ñïèñîê SNLINE'îâ ïóñò."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4847,16 +4675,16 @@ msgstr ""
 "SNLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñğîê_èñòå÷åíèÿ] {ìàñêà | íîìåğ_çàïèñè}[:"
 "ïğè÷èíà]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "Ñïèñîê SQLINE'îâ ïóñò."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4865,54 +4693,64 @@ msgstr ""
 "SQLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñğîê_èñòå÷åíèÿ] {ìàñêà | íîìåğ_çàïèñè} "
 "[ïğè÷èíà]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Ïàğîëü ïğèíÿò - âû ïğèçíàíû êàê âëàäåëåö íèêà."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Ïàğîëü ïğèíÿò - âû ïğèçíàíû êàê âëàäåëåö íèêà."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Íèê %s â ñåòè îòñóòñòâóåò."
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND #êàíàë ïğè÷èíà"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND #êàíàë ïğè÷èíà"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND íèê ïğè÷èíà"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK íèê íîâûé_íèê "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "Ñïèñîê SZLINE'îâ ïóñò."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4921,66 +4759,124 @@ msgstr ""
 "SZLINE {ADD|DEL|LIST|VIEW|CLEAR} [[+ñğîê_èñòå÷åíèÿ] {ìàñêà | íîìåğ_çàïèñè} "
 "[ïğè÷èíà]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr "    RESTART     Ñîõğàíèòü áàçû äàííûõ è ïåğåçàïóñòèòü ñåğâèñû"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Áåçîïàñíîñòü"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Áåçîïàñíîñòü âëàäåëüöà"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Êîíòğîëü ñòàòóñà îïåğàòîğà"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "Ğåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "Ğåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now off."
 msgstr "Ğåæèì êîíòğîëÿ çà ñòàòóñîì îïåğàòîğà äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure ops option for %s is now on."
+msgstr "Ğåæèì êîíòğîëÿ çà ñòàòóñîì îïåğàòîğà äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_secure.cpp:38
+#, fuzzy, c-format
+msgid "Secure option for %s is now off."
 msgstr "Ğåæèì áåçîïàñíîñòè äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
+#, fuzzy, c-format
+msgid "Secure option for %s is now on."
+msgstr "Ğåæèì áåçîïàñíîñòè äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Ğåæèì áåçîïàñíîñòè äëÿ %s àêòèâèğîâàí."
+
+#: modules/core/ns_set_secure.cpp:36
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option is now on for %s."
 msgstr "Ğåæèì áåçîïàñíîñòè äëÿ %s àêòèâèğîâàí."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Áåçîïàñíîñòü"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Îòïğàâêà ìåìî-ñîîáùåíèÿ óêàçàííîìó íèêó èëè êàíàëó"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr ""
+"    STAFF  Îòïğàâêà ìåìî-ñîîáùåíèÿ âñåì îïåğàòîğàì/àäìèíèñòğàòîğàì ñåòè"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Îòïğàâêà ìàññîâîãî ìåìî-ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Îòïğàâêà ãëîáàëüíîãî ñîîáùåíèÿ âñåì ïîëüçîâàòåëÿì ñåòè"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr ""
+"    OPNOTICE      àêòèâèğîâàíèå óâåäîìëåíèé îá èñïîëüçîâàíèè\n"
+"                  êîìàíä OP/DEOP"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr ""
+"    RSEND  Îòïğàâêà ìåìî-ñîîáùåíèÿ ñ óñëîâèåì ïîäòâåğæäåíèÿ î ïğî÷òåíèè"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Òåêóùåå êîë-âî ñåğâåğîâ: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr ""
 "Íà äàííûé ìîìåíò ñåğâèñû ğàáîòàşò â DEFCON-ğåæèìå. Ïîâòîğèòå ñâîé çàïğîñ "
 "ïîçæå."
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "DEFCON-ğåæèì àêòèâèğîâàí, óğîâåíü çàùèòû: %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Ğåæèì ğàáîòû ñåğâèñîâ èçìåíåí: NOEXPIRE-ğåæèì äåàêòèâèğîâàí."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr ""
 "Ğåæèì ğàáîòû ñåğâèñîâ èçìåíåí: àêòèâèğîâàí NOEXPIRE-ğåæèì (ğåæèì 'íå-"
@@ -4994,7 +4890,7 @@ msgstr "Ñåğâèñû ïåğåøëè â ğåæèì read-only (òîëüêî ÷òåíèå)."
 msgid "Services are now in read-write mode."
 msgstr "Ñåğâèñû ïåğåøëè â ğåæèì read-write (÷òåíèå-çàïèñü)."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Ğåæèì ğàáîòû ñåğâèñîâ èçìåíåí: àêòèâèğîâàí DEBUG-ğåæèì (óğîâåíü %d)."
@@ -5007,7 +4903,7 @@ msgstr "Ğåæèì ğàáîòû ñåğâèñîâ èçìåíåí: àêòèâèğîâàí DEBUG-ğåæèì (îòëàäêà)."
 msgid "Services are now in non-debug mode."
 msgstr "Ğåæèì ğàáîòû ñåğâèñîâ èçìåíåí: DEBUG-ğåæèì äåàêòèâèğîâàí."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr ""
 "Íàñòğîéêè mail-ôóíêöèé ñåğâèñîâ íåêîğğåêòíû èëè îòêëş÷åíû, âîçìîæíîñòü "
@@ -5019,7 +4915,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -5028,160 +4924,199 @@ msgstr ""
 "Âîçìîæíîñòü èçìåíÿòü ğåæèìû ñåğâèñàì íåäîñòóïíà. Âû âîîáùå óâåğåíû, ÷òî U:"
 "line-çàïèñè âàøèõ ñåğâåğîâ êîğğåêòíû?"
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Ñåğâèñû ğàáîòàşò: %d äíåé, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Ñåğâèñû ğàáîòàşò: %d ÷àñîâ, %d ìèíóò"
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Ñåğâèñû ğàáîòàşò: %d ìèíóò, %d ñåêóíä"
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Òåêóùåå êîë-âî ñåğâåğîâ: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Ğåæèì àâòîñòàòóñà äëÿ %s îòêëş÷åí"
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Ğåæèì àâòîñòàòóñà äëÿ %s àêòèâèğîâàí"
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr ""
 "Ğåæèì ïğèâàòíûõ ñîîáùåíèé äëÿ %s àêòèâèğîâàí, òåïåğü ñåğâèñû áóäóò îòâå÷àòü "
 "åìó â ïğèâàò."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr ""
 "Ğåæèì ïğèâàòíûõ ñîîáùåíèé äëÿ %s îòêëş÷åí, ñåğâèñû áóäóò îòâå÷àòü åìó "
 "ïîñğåäñòâîì íîòèñîâ."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Êîíôèãóğàöèîííûé ôàéë ñåğâèñîâ áûë ñ÷èòàí çàíîâî."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Âàø íèê îñâîáîæäåí îò óäåğæàíèÿ ñåğâèñàìè."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "Ëèìèò ñåññèé äëÿ %s óñòàíîâëåí íà %d."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Îãğàíè÷åíèå ñåññèé îòêëş÷åíî, ñïèñîê èñêëş÷åíèé íå òğåáóåòñÿ."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Ñåññèé          : %6d çàïèñåé, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Ñåññèè    Õîñò"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Óñòàíîâêà ğàçëè÷íûõ îïöèé êàêîãî-ëèáî íèêà"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Íàñòğîéêà ğàçëè÷íûõ îïöèé êàíàëà"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       óñòàíîâêà òèïà áàíà ñåğâèñàìè íà êàíàëå"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Óñòàíîâêà îïöèé äëÿ ìåìî-ñîîáùåíèé"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Íàñòğîéêà îïöèé íèêà, âêëş÷àÿ çàùèòó KILL'îì"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          èçìåíåíèå îïèñàíèÿ êàíàëà"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãğóïïû"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    óñòàíîâêà ãëàâíîãî íèêà ãğóïïû"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       ñìåíà âëàäåëüöà êàíàëà"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   âûáîğ ÿçûêà, ïîñğåäñòâîì êîòîğîãî\n"
+"               ñåğâèñû áóäóò ñ âàìè îáùàòüñÿ"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàğîëÿ íà íèê"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     óñòàíîâêà íàñëåäíèêà êàíàëà"
+
+#: modules/core/hs_setall.cpp:21
 #, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Óñòàíîâêà âèğò. õîñòà äëÿ âñåõ íèêîâ óêàçàííîé ãğóïïû"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Óñòàíîâêà âèğòóàëüíîãî õîñòà óêàçàííîìó ïîëüçîâàòåëş"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Íàñòğîéêà ğàçëè÷íûõ îïöèé ñåğâèñîâ"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   èçìåíåíèå òåêóùåãî ïàğîëÿ íà íèê"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Íåèçâåñòíûé ïóíêò %s. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ äîñòóïíûõ çíà÷åíèé ñì. /msg %"
 "s HELP LEVELS DESC"
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr ""
 " êà÷åñòâå ïàğàìåòğà äëÿ îïöèè DEBUG âû äîëæíû óêàçàòü ON, OFF, ëèáî "
 "ïîëîæèòåëüíîå ÷èñëî."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr ""
 " êà÷åñòâå ïàğàìåòğà äëÿ îïöèè NOEXPIRE âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr ""
 " êà÷åñòâå ïàğàìåòğà äëÿ îïöèè READONLY âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr ""
 " êà÷åñòâå ïàğàìåòğà äëÿ îïöèè SuperAdmin âû äîëæíû óêàçàòü ëèáî ON, "
 "ëèáî OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Ğåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèğîâàí."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     àêòèâèğîâàíèå/äåàêòèâèğîâàíèå àâòîñòàòóñà"
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Çàïğîñ èíôîğìàöè î ñòàòóñå ñåğâèñîâ è ñåòè"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      íàñòğîéêà ğåæèìà \"ïîäïèñàííûõ êèêîâ\""
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5190,29 +5125,35 @@ msgstr ""
 "Ğåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèğîâàí,\n"
 "íî áóäåò ğàáîòàòü â çàâèñèìîñòè îò íàñòğîåê óğîâíåé äîñòóïà."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Ğåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Ğåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "Ïîäïèñàííûå êèêè"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü èñïîëüçîâàíèÿ êîìàíäû RSEND â âàøåé IRC-ñåòè "
 "íåäîñòóïíà."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Èçâèíèòå, íàçíà÷åíèå áîòîâ íà êàíàë âğåìåííî íåäîñòóïíî."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Èçâèíèòå, íî ñîçäàòü áîòà íåóäàëîñü."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Èçâèíèòå, èçìåíåíèå íàñòğîåê áîòîâ âğåìåííî íåäîñòóïíî."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü íàñòğîéêè îïöèé áîòà âğåìåííî íåäîñòóïíà."
 
@@ -5223,7 +5164,7 @@ msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà AOP'îâ âğåìåííî íåäîñòóïíà."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà äîñòóïà êàíàëà âğåìåííî "
@@ -5235,64 +5176,43 @@ msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà àâòîêèêîâ êàíàëà âğåìåííî "
 "íåäîñòóïíà."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Èçâèíèòå, èçìåíåíèå áàçû äàííûõ ïëîõèõ ñëîâ âğåìåííî íåâîçìîæíî."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Èçâèíèòå, âîçìîæíîñòü óäàëåíèå êàíàëîâ âğåìåííî íåäîñòóïíà."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Èçâèíèòå, âîçìîæíîñòü óñòàíîâêè îïöèé êàíàëîâ âğåìåííî íåäîñòóïíà."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Èçâèíèòå, ğåãèñòğàöèÿ êàíàëîâ âğåìåííî ïğèîñòàíîâëåíà."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Èçâèíèòå, íî èçìåíèòü ïàğîëü äëÿ %s íåóäàëîñü."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Èçâèíèòå, íî èäåíòèôèöèğîâàòü íèê íå óäàëîñü."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr ""
 "Èçâèíèòå, íî âîçìîæíîñòü êîíôèãóğàöèè óñëîâèé êèêîâ âğåìåííî íåäîñòóïíà."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "Èçâèíèòå, íî íàñòğîéêà îïöèé ñëóæáû ñîîáùåíèé âğåìåííî íåâîçìîæíà."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Èçâèíèòå, íî âîçìîæíîñòü îòïğàâêè ñîîáùåíèé âğåìåííî íåäîñòóïíà."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü óäàëåíèÿ íèêîâ âğåìåííî íåäîñòóïíà."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Èçâèíèòå, íî âîçìîæíîñòü ãğóïïèğîâêè íèêîâ âğåìåííî íåäîñòóïíà."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "Èçâèíèòå, íî âîçìîæíîñòü íàñòğîéêè îïöèé íèêà âğåìåííî íåäîñòóïíà."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Èçâèíèòå, íî ğåãèñòğàöèÿ íèêîâ âğåìåííî ïğèîñòàíîâëåíà."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Èçâèíèòå, íî çàğåãèñòğèğîâàòü íèê íå óäàëîñü."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5303,12 +5223,12 @@ msgstr "Èçâèíèòå, â ñïèñêå äîñòóïà êàíàëà ìîæåò áûòü íå áîëåå %d çàïèñåé."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Èçâèíèòå, íî êîëè÷åñòâî çàïèñåé â ñïèñêå äîñòóïà íå ìîæåò ïğåâûøàòü %d"
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Èçâèíèòå, â ñïèñêå äîñòóïà êàíàëà ìîæåò áûòü íå áîëåå %d çàïèñåé."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Ñïèñîê àâòîêèêîâ êàíàëà ìîæåò ñîäåğæàòü íå áîëåå %d çàïèñåé."
@@ -5318,22 +5238,16 @@ msgstr "Ñïèñîê àâòîêèêîâ êàíàëà ìîæåò ñîäåğæàòü íå áîëåå %d çàïèñåé."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Ğàçìåğ áàçû äàííûõ ïëîõèõ ñëîâ íå ìîæåò ïğåâûøàòü %d çàïèñåé."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "Èçâèíèòå, íî âû óæå ïğåâûñèëè ëèìèò (%d) çàğåãèñòğèğîâàííûõ êàíàëîâ."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr ""
-"Êîëè÷åñòâî çàğåãèñòğèğîâàííûõ âàìè êàíàëîâ äîñòèãëî %d, à ıòî - ìàêñèìóì."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Èçâèíèòå, íî êîëè÷åñòâî çàïèñåé â ñïèñêå äîñòóïà íå ìîæåò ïğåâûøàòü %d"
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "Ñòàòèñòè÷åñêèå äàííûå ñáğîøåíû."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr ""
 "Ñòàòóñ íà ñåğâèñàõ îáíîâëåí (ìåìî-ñîîáùåíèÿ, âèğóòàëüíûé õîñò, è ò.ä.)."
@@ -5346,12 +5260,22 @@ msgstr "Õâàòèò ôëóäèòü!"
 msgid "Stop repeating yourself!"
 msgstr "Õâàòèò ïîâòîğîâ!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER îãğàíè÷åíèå íà ïîëó÷åíèå ñòàòóñà âëàäåëüöà êàíàëà"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     êîíòğîëü çà ïîëó÷åíèåì ñòàòóñà îïåğàòîğà êàíàëà"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "Íàñëåäíèê êàíàë %s óäàëåí."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "Íàñëåäíèêîì êàíàëà %s íàçíà÷åí ïîëüçîâàòåëü %s."
@@ -5360,21 +5284,36 @@ msgstr "Íàñëåäíèêîì êàíàëà %s íàçíà÷åí ïîëüçîâàòåëü %s."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "Äèğåêòèâà SuperAdmin îòêëş÷åíà â êîíôèãóğàöèîííîì ôàéëå ñåğâèñîâ."
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Óñòàíîâêà ğåæèìà ñàñïåíäà (\"çàìîğîçêè\") íà íèê"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Ñèìáèîç"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Ğåæèì ñèìáèîçà äëÿ êàíàëå %s àêòèâèğîâàí."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Ğåæèì ñèìáèîçà äëÿ êàíàëå %s àêòèâèğîâàí."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Ñèíõğîíèçèğóåò âèğòóàëüíûé õîñò äëÿ âñåõ íèêîâ ãğóïïû"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Ñèíòàêñèñ: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5403,7 +5342,7 @@ msgstr ""
 "2 - áàí âèäà *!*@õîñò\n"
 "3 - áàí âèäà *!*èäåíò@*.äîìåí"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5416,7 +5355,7 @@ msgstr ""
 "Ïîçâîëÿåò óñòàíîâèòü îïèñàíèå êàíàëà, êîòîğîå áóäåò ïîêàçàíî ïğè\n"
 "èñïîëüçîâàíèè êîìàíä LIST è INFO."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5429,7 +5368,7 @@ msgstr ""
 "Ïîçâîëÿåò ïåğåäàòü ïğàâà íà âëàäåíèå êàíàëîì äğóãîìó ïîëüçîâàòåëş.\n"
 "Íèê íîâîãî âëàäåëüöà êàíàëà äîëæåí áûòü çàğåãèñòğèğîâàííûì."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5449,7 +5388,7 @@ msgstr ""
 "æå, êàê òîëüêî êàíàë ñíîâà ñòàíåò àêòèâíûì (òî åñòü, íà íåãî îïÿòü\n"
 "êòî-ëèáî çàéäåò)."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5465,7 +5404,7 @@ msgstr ""
 "Êîãäà îï-óâåäîìëåíèå âêëş÷åíî, %s áóäåò ïîñûëàòü íîòèñ\n"
 "íà êàíàë êàæäûé ğàç, êîãäà êòî-ëèáî èñïîëüçóåò êîìàíäû OP/DEOP."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5484,7 +5423,7 @@ msgstr ""
 "Ïğèìå÷àíèå: òåì íå ìåíåå ëşáîé, èìåşùèé äîñòóï ê ıòèì êîìàíäàì,\n"
 "ñìîæåò èñïîëüçîâàòü èõ îòíîñèòåëüíî ñåáÿ."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5529,7 +5468,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5542,7 +5482,7 @@ msgstr ""
 "Àêòèâèğóåò/äåàêòèâèğóåò îïöèş ïğèâàòíîñòè êàíàëà. Äàííûé ğåæèì\n"
 "ïîçâîëÿåò ñêğûòü âàø êàíàë â ñïèñêå êàíàëîâ ïî /msg %s LIST."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5557,7 +5497,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5579,7 +5519,7 @@ msgstr ""
 "ñìîãóò çàïğîñèòü ñòàòóñ äàæå åñëè èìåşò àâòîğèçàöèş ê ñâîåìó íèêó\n"
 "âñåãî ëèøü ÷åğåç ñïèñîê ìàñîê íà %s."
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5598,7 +5538,7 @@ msgstr ""
 "ğåàëüíîãî âëàäåëüöà, ïğîïèñàííîãî â ãğàôå Founder (Âëàäåëåö êàíàëà).\n"
 "(è íå âàæíî, êòî òàì èäåíòèôèöèğîâàëñÿ ê êàíàëó ÷åğåç %s ID)."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5621,7 +5561,23 @@ msgstr ""
 "êàíàëîì è òîò áóäåò óäàëåí. Êî âñåìó ïğî÷åìó, íèê íàñëåäíèêà êàíàëà\n"
 "äîëæåí áûòü çàğåãèñòğèğîâàííûì íèêîì."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Ñèíòàêñèñ: %s #êàíàë TOPICLOCK {ON | OFF}\n"
+"\n"
+"Âêëş÷àåò èëè âûêëş÷àåò îïöèş áëîêèğîâêè òîïèêà íà êàíàëå. Ïğè\n"
+"âêëş÷åííîì ğåæèìå áëîêèğîâêè òîïèêà, %s ğàçğåøèò ìåíÿòü\n"
+"òîïèê êàíàëà òîëüêî ÷åğåç ñåğâèñíóş êîìàíäó TOPIC."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5671,8 +5627,8 @@ msgstr ""
 "Ïåğåêëş÷åíèå èç ñèñòåìû  xOP â ñèñòåìó  ACCESS  îáû÷íî ïğîõîäèò áåç\n"
 "êàêèõ-ëèáî ïğîáëåì."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5762,7 +5718,7 @@ msgstr ""
 "The ACCESS VIEW command displays the access list similar\n"
 "to ACCESS LIST bu"
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5809,7 +5765,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        âûâîäèò òåêóùèé ñïèñîê \"äîâåğåííûõ\" õîñòìàñîê."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5822,7 +5778,7 @@ msgstr ""
 "â IRC-êëèåíòå mIRC. Âû äîëæíû óêàçàòü îáà ïàğàìåòğà: òåêñò äåéñòâèÿ\n"
 "è #êàíàë."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5842,7 +5798,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5866,7 +5822,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5923,7 +5879,7 @@ msgstr ""
 "\n"
 "Êîìàíäà AKICK CLEAR ïîëíîñòüş î÷èùàåò ñïèñîê àâòîêèêîâ êàíàëà."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -6017,7 +5973,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR ïîçâîëÿåò  ïîëíîñòüş  î÷èñòèòü  ñïèñîê AKILL'îâ."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -6057,7 +6013,7 @@ msgstr ""
 "Ïğèìå÷àíèå: åñëè âû âèäèòå ìåòêó \"!\" ïåğåä èìåíåì êàíàëà, ıòî\n"
 "çíà÷èò ÷òî îí íàõîäèòñÿ â ğåæèìå NOEXPIRE."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -6075,7 +6031,7 @@ msgstr ""
 "íèê ñ óêàçàííûì óğîâíåì èëè âûøå.\n"
 "Äëÿ èñïîëüçîâàíèÿ ıòîé êîìàíäû íåîáõîäèìû ïğàâà Àäìèíèñòğàòîğà ñåğâèñîâ."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6105,17 +6061,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Ñèíòàêñèñ: AOP #êàíàë ADD íèê\n"
 "           AOP #êàíàë DEL {íèê | íîìåğ_çàïèñè | ñïèñîê_çàïèñåé}\n"
@@ -6159,7 +6104,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïğèâèëåãèé xOP ñì. ñïğàâî÷íóş èíôîğìàöèş\n"
 "ïî /msg %s HELP ACCESS è /msg %s HELP SET XOP."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6173,8 +6118,8 @@ msgstr ""
 "æå ïîñëå óñòàíîâêè, âû ñìîæåòå ñêîíôèãóğèğîâàòü îïöèè áîòà ïî ñâîåìó\n"
 "óñìîòğåíèş."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6195,20 +6140,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Ñèíòàêñèñ: BADWORDS #êàíàë ADD ñëîâî [SINGLE | START | END]\n"
 "           BADWORDS #êàíàë DEL {ñëîâî | íîìåğ_çàïèñè | ñïèñîê_çàïèñåé}\n"
@@ -6252,7 +6183,7 @@ msgstr ""
 " êà÷åñòâå äîïîëíèòåëüíîãî ïàğàìåòğà, âû ìîæåòå óêàçàòü ñèìâîëüíóş\n"
 "ìàñêó, ÷òî  ïîçâîëèò  âàì  ïîëó÷èòü  ñïèñîê ñ êîíêğå"
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6268,7 +6199,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş,  äàííàÿ  êîìàíäà  ìîæåò  áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6312,7 +6243,7 @@ msgstr ""
 "ëşáîé, êòî èñïîëüçóåò ıòîò íèê íà ìîìåíò ñîçäàíèÿ áîòà  -  áóäåò òóò\n"
 "æå îòêëş÷åí îò ñåòè."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6322,7 +6253,7 @@ msgstr ""
 "\n"
 "Âûâåäåò ñïèñîê âñåõ äîñòóïíûõ äëÿ óñòàíîâêè áîòîâ."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6334,7 +6265,21 @@ msgstr ""
 "Îòìåíÿåò ïîñëåäíåå ñîîáùåíèå, îòïğàâëåííîå âàìè óêàçàííîìó íèêó\n"
 "èëè êàíàëó, òåì ñàìûì ïğåäîõğàíÿÿ åãî îò ïğî÷òåíèÿ àäğåñàòîì."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6346,7 +6291,7 @@ msgstr ""
 "óêàçàííîé ïğè÷èíîé íà óêàçàííûé ïğîìåæóòîê âğåìåíè.  êà÷åñòâå ìàñêè\n"
 "AKILL'îâ áóäóò èñïîëüçîâàíû ìàñêè ïîñåòèòåëåé êàíàëà âèäà èäåíò@õîñò."
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6369,7 +6314,7 @@ msgstr ""
 "Äîïîëíèòåëüíûé ïàğàìåòğ SECRET ïîçâîëÿåò ïîëó÷èòü ñïèñîê êàíàëîâ\n"
 "ñ ğåæèìàìè +s/+p, ñîâïàäàşùèõ ñ óêàçàííîé ñèìâîëüíîé ìàñêîé."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6382,7 +6327,7 @@ msgstr ""
 "óêàçàííûì íèêîì.\n"
 "Ïğèìå÷àíèå: êîìàíäà ğàáîòàåò òîëüêî äëÿ íèêîâ, íå äëÿ êàíàëîâ."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6398,7 +6343,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
 "âëàäåëüöåì êàíàëà."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6408,16 +6353,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6434,7 +6392,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6448,7 +6406,7 @@ msgstr ""
 "êàñàòüñÿ íå òîëüêî ğàáîòû ñàìèõ ñåğâèñîâ, íî è ôóíêöèîíèğîâàíèÿ ñåòè\n"
 "â öåëîì, ÷òî, ïîğîş, âåñüìà ïîëåçíî ïğè ğàçíîãî ğîäà àòàêàõ íà ñåòü."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6472,7 +6430,7 @@ msgstr ""
 "èëè ëèöàìè ñ óğîâíåì äîñòóïà 4 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6482,7 +6440,7 @@ msgstr ""
 "\n"
 "Óäàëÿåò âèğòóàëüíûé õîñò íàçíà÷åííûé óêàçàííîìó íèêó."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6519,7 +6477,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      óäàëèò âñå ñîîáùåíèÿ ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6530,7 +6488,7 @@ msgstr ""
 "\n"
 "Óäàëÿåò âèğòóàëüíûå õîñòû ó âñåõ íèêîâ óêàçàííîé ãğóïïû."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6551,7 +6509,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş,  äàííàÿ  êîìàíäà  ìîæåò  áûòü  èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6571,7 +6529,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş,  äàííàÿ  êîìàíäà  ìîæåò  áûòü  èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6592,7 +6550,7 @@ msgstr ""
 "ëèöàìè ñ óğîâíåì äîñòóïà 10 (SOP) è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6615,7 +6573,7 @@ msgstr ""
 "èëè ëèöàìè  ñ  óğîâíåì  äîñòóïà  3 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6627,7 +6585,7 @@ msgstr ""
 "Óäàëÿåò óêàçàííûé êàíàë èç áàçû äàííûõ ñåğâèñîâ. Èñïîëüçîâàòü DROP\n"
 "ìîæåò ëèøü âëàäåëåö êàíàëà."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6641,8 +6599,8 @@ msgstr ""
 "Êàê Àäìèíèñòğàòîğ ñåğâèñîâ, âû ìîæåòå óäàëèòü ëşáîé çàğåãèñòğèğîâàííûé\n"
 "êàíàë ñåòè áåç êàêîé-ëèáî èäåíòèôèêàöèè ê íåìó."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6672,7 +6630,7 @@ msgstr ""
 "ê óäàëÿåìîñó íèêó (èëè ãğóïïå íèêîâ). Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè\n"
 "ñì. /msg %s HELP IDENTIFY"
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6693,7 +6651,7 @@ msgstr ""
 "ëşáîé íèê èç âàøåé ãğóïïû, íå èìåÿ êàêèõ-ëèáî îñîáûõ ïğèâèëåãèé.\n"
 "Óäàëèòü àáñîëşòíî ëşáîé íèê ìîãóò òîëüêî Àäìèíèñòğàòîğû ñåğâèñîâ."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6784,7 +6742,7 @@ msgstr ""
 "õîñòà. Ñëèøêîì áîëüøîé ñïèñîê èñêëş÷åíèé ñ øèğîêèìè ìàñêàìè â\n"
 "äîñòàòî÷íîé ìåğå âëèÿåò íà ïğîèçâîäèòåëüíîñòü ñåğâèñîâ."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6801,7 +6759,7 @@ msgstr ""
 "Ïğèìå÷àíèå: â çàâèñèìîñòè îò íàñòğîåê ñåğâèñîâ, ïğè÷èíà ìîæåò\n"
 "áûòü ïàğàìåòğîì êàê îïöèîíàëüíûì, òàê è íåîáõîäèìûì."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6817,7 +6775,7 @@ msgstr ""
 "\n"
 " íåêîòîğûõ ñåòÿõ, ïğè÷èíà ÿâëÿåòñÿ îáÿçàòåëüíûì ïàğàìåòğîì."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6832,7 +6790,7 @@ msgstr ""
 "ñîîáùåíèå, âêëş÷àşùåå íèê âûçâàâøåãî êîìàíäó è óêàçàííûé email,\n"
 "áóäåò çàïèñàíî â ëîã-ôàéë ñåğâèñîâ."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6842,7 +6800,7 @@ msgstr ""
 "\n"
 "Ïîçâîëÿåò çàïğîñèòü ó ñåğâèñîâ êëş÷-ïàğîëü êàíàëà."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6861,7 +6819,7 @@ msgstr ""
 "Îäíîâğåìåííî ñ ıòèì, ñîáûòèå áóäåò çàïèñàíî â ëîã-ôàéë.\n"
 "Ïğèìå÷àíèå 2: êîìàíäà íåäîñòóïíà, åñëè âêëş÷åíî øèôğîâàíèå ïàğîëåé."
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6892,7 +6850,7 @@ msgstr ""
 "îòêëş÷àåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå äàííîé êîìàíäû äàæå ïğè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åğåç ñïèñîê õîñòìàñîê."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6902,7 +6860,7 @@ msgstr ""
 "\n"
 "Âûâîäèò ñïèñîê íèêîâ â âàøåé ãğóïïå."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6933,7 +6891,7 @@ msgstr ""
 "âñåì ïîëüçîâàòåëÿì ñåòè.  êà÷åñòâå íèêà îòïğàâèòåëÿ áóäåò óêàçàí\n"
 "%s."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6946,7 +6904,8 @@ msgstr ""
 "İòà êîìàíäà ïîçâîëÿåò ïîëüçîâàòåëÿì óñòàíîâèòü âèğòóàëüíûé õîñò\n"
 "ñ èõ ÒÅÊÓÙÅÃÎ íèêà íà âñå íèêè ãğóïïû."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -7008,7 +6967,7 @@ msgstr ""
 "íèêàê íåìîæåò.\n"
 "Ïğèìå÷àíèå 2: ó âñåõ íèêîâ â ãğóïïå - åäèíûé ïàğîëü."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -7031,7 +6990,7 @@ msgstr ""
 "èëè ëèöàìè ñ óğîâíåì äîñòóïà 4 è âûøå  (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -7060,16 +7019,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Ñèíòàêñèñ: HOP #êàíàë ADD íèê\n"
 "           HOP #êàíàë DEL {íèê | íîìåğ_çàïèñè | ñïèñîê_çàïèñåé}\n"
@@ -7111,7 +7060,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïğèâèëåãèé xOP ñì. ñïğàâî÷íóş èíôîğìàöèş\n"
 "ïî /msg %s HELP ACCESS è /msg %s HELP SET XOP."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -7130,7 +7079,7 @@ msgstr ""
 "ïàğîëÿ âû äîëæíû óêàçàòü òîò ñàìûé ïàğîëü, êîòîğûé óêàçûâàëè ïğè\n"
 "ğåãèñòğàöèè âàøåãî íèêà."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -7140,7 +7089,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7172,7 +7121,7 @@ msgstr ""
 "Ïîëüçîâàòåëè ñî ñòàòóñîì  IRC-îïåğàòîğà  èãíîğèğîâàòüñÿ  ñåğâèñàìè íå\n"
 "áóäóò, äàæå åñëè îíè ïğèñóòñòâóşò â ñïèñêå èãíîğà."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7191,7 +7140,7 @@ msgstr ""
 "Ïğèìå÷àíèå: ïî-óìîë÷àíèş, èñïîëüçîâàòü êîìàíäó ñ ïàğàìåòğîì ALL\n"
 "ìîæåò òîëüêî âëàäåëåö êàíàëà."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7208,7 +7157,7 @@ msgstr ""
 "ïàğàìåòğ ALL, ÷òîáû ïîëó÷èòü âñş äîñòóïíóş èíôîğìàöèş, â òîì ÷èñëå\n"
 "è òó, êîòîğàÿ ñêğûòà."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7224,7 +7173,7 @@ msgstr ""
 "âû ìîæåòå ïğèíÿòü. Åñëè  âû  óêàæåòå  â êà÷åñòâå ïàğàìåòğà êàíàë - \n"
 "âûâåäåò àíàëîãè÷íóş èíôîğìàöèş îá óêàçàííîì êàíàëå."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7250,7 +7199,7 @@ msgstr ""
 "óêàçàííîì íèêå.\n"
 "Äàííûé ïàğàìåòğ ìîãóò èñïîëüçîâàòü òîëüêî Àäìèíèñòğàòîğû ñåğâèñîâ."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7269,7 +7218,7 @@ msgstr ""
 "îïöèè).\n"
 "Ïğèìå÷àíèå: äàííûå áóäóò ïîñëàíû îò ëèöà %s"
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7313,7 +7262,7 @@ msgstr ""
 "Ïğèìå÷àíèå: ïàğàìåòğ ïğè÷èíà ÿâëÿåòñÿ íå îáÿçàòåëüíûì, åñëè âû åãî\n"
 "íå óêàæåòå, áóäåò èñïîëüçîâàíà ñòàíäàğòíàÿ, âèäà: \"Juped by <íèê>\"."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7329,7 +7278,8 @@ msgstr ""
 "Ïî-óìîë÷àíèş,  äàííàÿ  êîìàíäà  ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7355,7 +7305,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7383,8 +7333,8 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7458,7 +7408,7 @@ msgstr ""
 "\n"
 "*** SpamMan was kicked by %s (Alcan (Flood))"
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7476,7 +7426,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7495,7 +7445,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7537,7 +7487,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7556,7 +7506,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7585,7 +7535,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7601,7 +7551,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7620,7 +7570,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7638,7 +7588,7 @@ msgstr ""
 "ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå \"0\" èëè\n"
 "\"-\" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàğóøèòåëÿ."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7691,7 +7641,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7726,7 +7676,7 @@ msgstr ""
 "Ëèìèò îäíîâğåìåííî ïîêàçûâàåìûõ çàïèñåé îãğàíè÷åí ÷èñëîì, óêàçàííûì\n"
 "â êîíôèãóğàöèîííîì ôàéëå ñåğâèñîâ äèğåêòèâîé NSListMax."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7744,7 +7694,7 @@ msgstr ""
 "Ïğèìå÷àíèå: ïğè ïîèñêå êàíàëîâ íà÷èíàşùèõñÿ ñ \"#\",  ñàì ñèìâîë\n"
 "\"#\" óêàçûâàòü íå íàäî - îí çàğåçåğâèğîâàí äëÿ ñïèñêà (ñì. âûøå)."
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7782,7 +7732,7 @@ msgstr ""
 "        Ïîêàæåò âñå íèêè, ïğèíàäëåæàùèå ïîëüçîâàòåëÿì\n"
 "        â äîìåíå bar.org."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7841,7 +7791,7 @@ msgstr ""
 "       Ïîêàæåò âñå çàğåãèñòğèğîâàííûå íèêè ó êîòîğûõ âêëş÷åíà îïöèÿ\n"
 "       NOEXPIRE."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7864,11 +7814,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      ïîêàæåò ñîîáùåíèÿ ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Ñèíòàêñèñ: LOGONNEWS ADD òåêñò"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7907,7 +7867,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: LOGONNEWS DEL {íîìåğ | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7923,7 +7883,7 @@ msgstr ""
 "Ïğèìå÷àíèå: òåì íå  ìåíåå,  ïîñëå  èñïîëüçîâàíèÿ  äàííîé  êîìàíäû,\n"
 "ñåğâèñû íå ïîøëşò âàì çàïğîñ î íåîáõîäèìîñòè èäåíòèôèêàöèè ê íèêó."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7949,23 +7909,7 @@ msgstr ""
 "Èñïîëüçîâàòü ïàğàìåòğû íèê è REVALIDATE ìîãóò ëèøü Àäìèíèñòğàòîğû\n"
 "ñåğâèñîâ."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Ñèíòàêñèñ: MODE #êàíàë ğåæèìû\n"
-"\n"
-"Ïîçâîëÿåò Îïåğàòîğàì ñåğâèñîâ èçìåíÿòü ğåæèìû íà êàêîì-ëèáî êàíàëå.\n"
-" êà÷åñòâå âòîğîãî ïàğàìåòğà êîìàíäû, âû äîëæíû óêàçàòü ğåæèìû â\n"
-"òîì æå ôîğìàòå, â êîòîğîì óêàçûâàåòå ïğè ğó÷íîé óñòàíîâêå, ñ ïîìîùüş\n"
-"êîìàíäû /MODE."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7992,7 +7936,23 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Ñèíòàêñèñ: MODE #êàíàë ğåæèìû\n"
+"\n"
+"Ïîçâîëÿåò Îïåğàòîğàì ñåğâèñîâ èçìåíÿòü ğåæèìû íà êàêîì-ëèáî êàíàëå.\n"
+" êà÷åñòâå âòîğîãî ïàğàìåòğà êîìàíäû, âû äîëæíû óêàçàòü ğåæèìû â\n"
+"òîì æå ôîğìàòå, â êîòîğîì óêàçûâàåòå ïğè ğó÷íîé óñòàíîâêå, ñ ïîìîùüş\n"
+"êîìàíäû /MODE."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -8002,7 +7962,7 @@ msgstr ""
 "\n"
 "Âûâîäèò ïîäğîáíóş èíôîğìàöèş î êîíêğåòíîì çàãğóæåííîì ìîäóëå."
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -8014,7 +7974,7 @@ msgstr ""
 "ïàğàìåòğà âû ìîæåòå óêàçàòü òèï ìîäóëÿ - ıòî ïîçâîëèò ïîëó÷èòü ñïèñîê,\n"
 "îòâå÷àşùèé óêàçàííûì òğåáîâàíèÿì."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -8026,7 +7986,7 @@ msgstr ""
 "Ïîçâîëÿåò çàãğóçèòü êàêîé-ëèáî äîïîëíèòåëüíûé ìîäóëü èç äèğåêòîğèè\n"
 "ñ ìîäóëÿìè (modules/). "
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -8038,7 +7998,7 @@ msgstr ""
 "Ïîçâîëÿåò çàãğóçèòü êàêîé-ëèáî äîïîëíèòåëüíûé ìîäóëü èç äèğåêòîğèè\n"
 "ñ ìîäóëÿìè (modules/). "
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -8050,7 +8010,7 @@ msgstr ""
 "Âûãğóæàåò óêàçàííûé ìîäóëü (åñëè ìîäóëü çàãğóæåí è åñëè óñëîâèÿ\n"
 "ïîçâîëÿşò åãî âûãğóçèòü)."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -8078,7 +8038,7 @@ msgstr ""
 "\n"
 "Ïğèìå÷àíèå: íàëè÷èå ñåğâåğà â ñåòè ñåğâèñàìè íå ïğîâåğÿåòñÿ."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -8090,7 +8050,7 @@ msgstr ""
 "Äåàêòèâèğóåò âàø òåêóùèé âèğòóàëüíûé õîñò, ïğè óñëîâèè, êîíå÷íî,\n"
 "÷òî òàêîâîé óñòàíîâëåí íà ìîìåíò èñïîëüçîâàíèÿ êîìàíäû."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -8107,7 +8067,7 @@ msgstr ""
 "\n"
 "Äëÿ èñïîëüçîâàíèÿ ıòîé êîìàíäû íåîáõîäèìû ïğàâà Ñóïåğ-Àäìèíèñòğàòîğà."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -8121,7 +8081,7 @@ msgstr ""
 "çàìåíåí íà âèğòóàëüíûé, è, ñîîòâåòñòâåííî, îí è áóäåò ïîêàçàí â\n"
 "/WHOIS-èíôîğìàöèè âàøåãî íèêà."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -8146,7 +8106,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Ñèíòàêñèñ: OPERNEWS ADD òåêñò"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -8186,7 +8146,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: OPERNEWS DEL {íîìåğ | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -8206,7 +8166,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè èëè\n"
 "ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -8228,7 +8188,7 @@ msgstr ""
 "ëèöàìè ñ óğîâíåì äîñòóïà 10 (SOP) è âûøå  (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8257,16 +8217,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8305,7 +8255,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8328,7 +8278,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Ñèíòàêñèñ: RANDOMNEWS ADD òåêñò"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8361,7 +8311,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Ñèíòàêñèñ: RANDOMNEWS DEL {íîìåğ | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8386,7 +8336,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      âûâåäåò òåêñò âñåõ ñîîáùåíèé ñ 2-ãî ïî 5-îå è ñ 7-ãî ïî 9-îå."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8444,8 +8395,8 @@ msgstr ""
 "èçìåíÿåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå äàííîé êîìàíäû äàæå ïğè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åğåç ñïèñîê õîñòìàñîê."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8487,8 +8438,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8553,7 +8504,7 @@ msgstr ""
 "ñ îáùåé äëÿ íèõ èíôîğìàöèåé, íàñòğîéêàìè, ñïèñêîì äîñòóïà. Äëÿ áîëåå\n"
 "ïîäğîáíîé èíôîğìàöèè ñì. /msg %s HELP GROUP"
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8585,7 +8536,7 @@ msgstr ""
 "óäåğæèâàåìîãî íèêà. Äîïóñòèìî èñïîëüçîâàíèå  äàííîé êîìàíäû  äàæå ïğè\n"
 "èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åğåç ñïèñîê õîñòìàñîê."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8600,7 +8551,7 @@ msgstr ""
 "òğåáóåò  ïîëíîãî  ïåğåçàïóñêà  ñåğâèñîâ  (íàïğèìåğ: èçìåíåíèå íèêîâ\n"
 "ñåğâèñîâ, àêòèâàöèÿ ëèìèòèğîâàíèÿ ñåññèé, è ò.ä.)"
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8612,7 +8563,7 @@ msgstr ""
 "Êîìàíäà RESEND ïîçâîëÿåò çàíîâî âûñëàòü íîâûé auth-êîä (êîäîâóş\n"
 "ôğàçó) íà email-àäğåñ ïîëüçîâàòåëÿ, èñïîëüçóşùåãî ıòó êîìàíäó."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8634,7 +8585,7 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåğâèñû ñîõğàíèòü âñå áàçû äàííûõ è òóò æå ïåğåçàïóñòèòüñÿ."
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8656,7 +8607,7 @@ msgstr ""
 "Ñàìî ñîáîé ğàçóìååòñÿ, ÷òî íèê/êàíàë îòïğàâèòåëÿ/ïîëó÷àòåëÿ äîëæíû\n"
 "áûòü çàğåãèñòğèğîâàíû."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8668,7 +8619,7 @@ msgstr ""
 "Ïîçâîëÿåò Àäìèíèñòğàòîğàì ñåğâèñîâ íàñòğàèâàòü êàêèå-ëèáî îïöèè äëÿ\n"
 "óêàçàííîãî íèêà áåç èäåíòèôèêàöèè ê íåìó. Ñïèñîê îïöèè:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8684,7 +8635,7 @@ msgstr ""
 "âëàäåëüöó íèêà ñòàòóñ ïğè âõîäå íà êàíàë. Ñîîòâåòñòâåííî OFF  -\n"
 "äëÿ îòêëş÷åíèÿ."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8698,7 +8649,7 @@ msgstr ""
 "ïğîïèñàí.\n"
 "Ïğèìå÷àíèå: íîâûé ãëàâíûé íèê äîëæåí ñîñòîÿòü â ãğóïïå íèêà."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8709,7 +8660,7 @@ msgstr ""
 "Àññîöèèğóåò email-àäğåñ ñ óêàçàííûì íèêîì. Äàííûé email áóäåò ïîêàçàí\n"
 "â èíôîğìàöèè îá óêàçàííîì íèêå, ïğåäîñòàâëÿåìîé ïî êîìàíäå INFO."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8725,7 +8676,7 @@ msgstr ""
 "÷òî äëÿ îòîáğàæåíèÿ ïğèâåòñâèÿ, íà êàíàëå äîëæíà áûòü àêòèâèğîâàíà\n"
 "îïöèÿ GREET è íèê äîëæåí èìåòü ñîîòâåòñòâóşùèé óğîâåíü äîñòóïà."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8753,7 +8704,7 @@ msgstr ""
 " êà÷åñòâå òğåòüåãî ïàğàìåòğà âû äîëæíû óêàçàòü ëèáî ON ëèáî OFF.\n"
 "Ïåğâûé àêòèâèğóåò ñêğûòèå, âòîğîé, ñîîòâåòñòâåííî, äåàêòèâèğóåò."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8789,25 +8740,7 @@ msgstr ""
 "Ïğèìå÷àíèå: âîçìîæíîñòü óñòàíîâêè ìåòîäà çàùèòû IMMED ìîæåò áûòü\n"
 "îòêëş÷åíà â âàøåé IRC-ñåòè."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Ñèíòàêñèñ: SASET íèê LANGUAGE íîìåğ\n"
-"\n"
-"Èçìåíÿåò ÿçûê, íà êîòîğîì ñåğâèñû áóäóò ïîñûëàòü ñîîáùåíèÿ óêàçàííîìó\n"
-"íèêó (íàïğèìåğ,  òåêñò  ñïğàâî÷íîé  ñèñòåìû,  êîòîğûé  âû ñåé÷àñ è\n"
-"÷èòàåòå).\n"
-"  êà÷åñòâå  íîìåğà  âû  äîëæíû óêàçàòü êîíêğåòíûé íîìåğ ÿçûêà èç\n"
-"ñïèñêà ïîääåğæèâàåìûõ ÿçûêîâ: /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8824,7 +8757,7 @@ msgstr ""
 "óâåäîìëåíèé (notice, íîòèñû).\n"
 "Ïğèìå÷àíèå: íàñòğîéêà äàííîé îïöèè ìîæåò áûòü çàáëîêèğîâàíà."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8837,7 +8770,7 @@ msgstr ""
 "ïî âğåìåíè. Óêàæèòå ON, ÷òî áû àêòèâèğîâàòü òàê íàçûâàåìûé ğåæèì\n"
 "'íå-èñòå÷åíèÿ'. Ïàğàìåòğ OFF ñíîâà âîçâğàùàåò íèê â ğåæèì èñòå÷åíèÿ."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8849,7 +8782,7 @@ msgstr ""
 "Ïîçâîëÿåò èçìåíèòü ïàğîëü íèêà, èñïîëüçóåìûé äëÿ èäåíòèôèêàöèè\n"
 "â êà÷åñòâå âëàäåëüöà íèêà."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8868,7 +8801,7 @@ msgstr ""
 "Ïğèìå÷àíèå: òåì íå ìåíåå ëşáîé, êòî çíàåò òî÷íîå íàïèñàíèå íèêà,\n"
 "èìååò âîçìîæíîñòü ïîëó÷èòü èíôîğìàöèş î íåì èñïîëüçóÿ êîìàíäó INFO."
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8897,7 +8830,7 @@ msgstr ""
 "áû îäíà õîñòìàñêà, ñîâïàäàşùàÿ ñ òåêóùåé õîñòìàñêîé ïîëüçîâàòåëÿ,\n"
 "âçÿâøåãî íèê. Ğåæèì îïöèè KILL ïğè ıòîì çíà÷åíèÿ íå èìååò."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8907,7 +8840,7 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò áîòà ïîñëàòü óêàçàííûé òåêñò íà óêàçàííûé #êàíàë."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8925,7 +8858,7 @@ msgstr ""
 "Ïğèìå÷àíèå: ïîëó÷àòåëü, áóäü òî íèê èëè êàíàë, äîëæåí áûòü\n"
 "çàğåãèñòğèğîâàí, äëÿ âîçìîæíîñòè îòïğàâêè/ïîëó÷åíèÿ ìåìî-ñîîáùåíèé."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8937,7 +8870,7 @@ msgstr ""
 "Îòïğàâëÿåò ìàññîâîå ìåìî-ñîîáùåíèå âñåì çàğåãèñòğèğîâàííûì\n"
 "ïîëüçîâàòåëÿì ñåòè."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8956,7 +8889,7 @@ msgstr ""
 "Ïğèìå÷àíèå: SENDPASS ìîæåò áûòü îãğàíè÷åí äëÿ èñïîëüçîâàíèÿ òîëüêî\n"
 "IRC-îïåğàòîğàìè äàííîé ñåòè."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8992,7 +8925,7 @@ msgstr ""
 "ñåññèé è êàê óñòàíîâèòü îòäåëüíûé ëèìèò ñåññèé äëÿ îïğåäåëåííîãî\n"
 "õîñòà èëè ãğóïïû õîñòîâ."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -9007,7 +8940,7 @@ msgstr ""
 "ôîğìàò SET <íèê> <èäåíò>@<õîñòìàñêà> äëÿ óñòàíîâêè âèğòóàëüíûõ\n"
 "èäåíòà è õîñòà îäíîâğåìåííî."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -9024,8 +8957,8 @@ msgstr ""
 "â  ñïèñêå  äîñòóïà  êàíàëà  èëè  ïğàâà  êîòîğûõ íå ñîîòâåòñòâóşò\n"
 "ïîëó÷àåìîìó ñòàòóñó."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -9050,25 +8983,9 @@ msgstr ""
 "ñèñòåìó LEVELS íà êàíàëå (ñì. /msg %s HELP LEVELS äëÿ\n"
 "áîëåå ïîäğîáíîé èíôîğìàöèè)."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Ñèíòàêñèñ: %s #êàíàë TOPICLOCK {ON | OFF}\n"
-"\n"
-"Âêëş÷àåò èëè âûêëş÷àåò îïöèş áëîêèğîâêè òîïèêà íà êàíàëå. Ïğè\n"
-"âêëş÷åííîì ğåæèìå áëîêèğîâêè òîïèêà, %s ğàçğåøèò ìåíÿòü\n"
-"òîïèê êàíàëà òîëüêî ÷åğåç ñåğâèñíóş êîìàíäó TOPIC."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -9103,7 +9020,7 @@ msgstr ""
 "Ïğèìå÷àíèå: äîñòóï ê ıòîé êîìàíäå îïğåäåëÿåòñÿ óğîâíåì äîñòóïà ê\n"
 "êîìàíäå SET (ñèñòåìà LEVELS)."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -9115,7 +9032,7 @@ msgstr ""
 "îáû÷íûì ïîëüçîâàòåëÿì èñïîëüçîâàòü åãî. Äîñòóï ê íåìó áóäåò òîëüêî\n"
 "ó àäìèíèñòğàöèè ñåòè."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -9129,7 +9046,7 @@ msgstr ""
 "Ïîçâîëÿåò âëàäåëüöó êàíàëà ìåíÿòü ğàçëè÷íûå íàñòğîéêè êàíàëà.\n"
 "Äîñòóïíûå îïöèè:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -9144,7 +9061,7 @@ msgstr ""
 "âñåõ îïåğàòîğîâ êàíàëà, íå âàæíî, ñîîòâåòñòâóåò èõ óğîâåíü äîñòóïà\n"
 "çíà÷åíèş óñòàíîâêè NOKICK èëè íåò."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -9159,7 +9076,7 @@ msgstr ""
 "âñåõ âîéñîâ êàíàëà, íå âàæíî, ñîîòâåòñòâóåò èõ óğîâåíü äîñòóïà\n"
 "çíà÷åíèş óñòàíîâêè NOKICK èëè íåò."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -9213,7 +9130,7 @@ msgstr ""
 "!deprotect, !owner è !deowner  -  ìîãóò áûòü íåäîñòóïíû â âàøåé\n"
 "ñåòè."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -9229,7 +9146,7 @@ msgstr ""
 "âñåõ òåõ ïîëüçîâàòåëåé, êîòîğûå èìåşò äîñòàòî÷íûé óğîâåíü äîñòóïà\n"
 "íà êàíàëå è óñòàíîâèëè ñåáå òåêñò ïğèâåòñòâèÿ (ñì. íàñòğîéêè íèêà)."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -9244,7 +9161,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -9260,7 +9177,7 @@ msgstr ""
 "Åñëè áîò óæå óñòàíîâëåí íà êàíàëå, îí áóäåò àâòîìàòè÷åñêè óäàëåí ñ\n"
 "íåãî ñğàçó æå ïîñëå âêëş÷åíèÿ äàííîé îïöèè."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -9274,7 +9191,7 @@ msgstr ""
 "èñòå÷åíèÿ åãî ğåãèñòğàöèè ïî âğåìåíè. Ñîîòâåòñòâåííî äåàêòèâèğîâàíèå\n"
 "ğåæèìà âåğíåò âñå íà êğóãè ñâîÿ."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -9292,8 +9209,8 @@ msgstr ""
 "áîò ñîâåğøàë îò ñåáÿ, íàïğèìåğ òàêèå, êàê: ñìåíà ğåæèìîâ, óñòàíîâêà\n"
 "áàíîâ, êèêè ïîëüçîâàòåëåé è ò. ä."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9318,7 +9235,7 @@ msgstr ""
 "Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè î êîíêğåòíîé îïöèè âîñïîëüçóéòåñü\n"
 "êîìàíäîé /msg %s HELP SET îïöèÿ."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9329,7 +9246,7 @@ msgstr ""
 "Êîìàíäà SET ïîçâîëÿåò âàì íàñòğîèòü ğàçëè÷íûå îïöèè íèêà.\n"
 "Ñïèñîê îïöèé:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9355,7 +9272,7 @@ msgstr ""
 "    SUPERADMIN àêòèâàöèÿ/äåàêòèâàöèÿ ğåæèìà Ñóïåğ-Àäìèíèñòğàòîğà\n"
 "                 (îòíîñèòåëüíî èñïîëüçóşùåãî êîìàíäó)"
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9368,7 +9285,7 @@ msgstr ""
 "Óêàæèòå ON, åñëè õîòèòå ÷òî áû ñåğâèñû àâòîìàòè÷åñêè äàâàëè âàì\n"
 "ñòàòóñ ïğè âõîäå íà êàíàë. Ñîîòâåòñòâåííî OFF - äëÿ îòêëş÷åíèÿ."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9381,7 +9298,7 @@ msgstr ""
 "îòîáğàæàòüñÿ â ñïèñêå äîñòóïà êàíàëîâ, ãäå âû ïğîïèñàíû.\n"
 "Ïğèìå÷àíèå: íîâûé ãëàâíûé íèê äîëæåí ñîñòîÿòü â âàøåé ãğóïïå íèêîâ."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9394,7 +9311,7 @@ msgstr ""
 "Àññîöèèğóåò email-àäğåñ ñ âàøèì íèêîì. Äàííûé email áóäåò ïîêàçàí\n"
 "â èíôîğìàöèè î âàøåì íèêå, ïğåäîñòàâëÿåìîé ïî êîìàíäå INFO."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9410,7 +9327,7 @@ msgstr ""
 "÷òî äëÿ îòîáğàæåíèÿ ïğèâåòñòâèÿ, íà êàíàëå äîëæíà áûòü àêòèâèğîâàíà\n"
 "îïöèÿ GREET è âû äîëæíû èìåòü ñîîòâåòñòâóşùèé óğîâåíü äîñòóïà."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9438,7 +9355,7 @@ msgstr ""
 " êà÷åñòâå òğåòüåãî ïàğàìåòğà âû äîëæíû óêàçàòü ëèáî ON ëèáî OFF.\n"
 "Ïåğâûé àêòèâèğóåò ñêğûòèå, âòîğîé, ñîîòâåòñòâåííî, äåàêòèâèğóåò."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9474,7 +9391,7 @@ msgstr ""
 "Ïğèìå÷àíèå: âîçìîæíîñòü óñòàíîâêè ìåòîäà çàùèòû IMMED ìîæåò áûòü\n"
 "îòêëş÷åíà â âàøåé IRC-ñåòè."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9492,7 +9409,7 @@ msgstr ""
 " êà÷åñòâå íîìåğà, âû äîëæíû óêàçàòü êîíêğåòíûé íîìåğ ÿçûêà èç\n"
 "ñïèñêà ïîääåğæèâàåìûõ ÿçûêîâ:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9509,7 +9426,7 @@ msgstr ""
 "âîçìîæíîñòü ïğèíÿòèÿ ñîîáùåíèé.\n"
 "Ìàêñèìàëüíî äîïóñòèìîå çíà÷åíèå: %d."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9551,7 +9468,7 @@ msgstr ""
 "ïğèâèëåãèè. Îíè íå ìîãóò óäàëèòü ñâîé ëèìèò, íå ìîãóò óñòàíîâèòü\n"
 "ëèìèò âûøå %d, è íå ìîãóò èñïîëüçîâàòü îïöèş HARD."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9561,7 +9478,7 @@ msgstr ""
 "\n"
 "Îòîáğàæàåò ñòàòóñ ğàçëè÷íûõ ñåğâèñíûõ íàñòğîåê (âêë/âûêë)."
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9577,7 +9494,7 @@ msgstr ""
 "çàñòàâèò ñåğâèñû èñïîëüçîâàòü ğåæèì óâåäîìëåíèé (notice, íîòèñû).\n"
 "Ïğèìå÷àíèå: íàñòğîéêà äàííîé îïöèè ìîæåò áûòü çàáëîêèğîâàíà."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9597,7 +9514,7 @@ msgstr ""
 "Àêòèâèğîâàíèå äàííîé îïöèè ıêâèâàëåíòíî çàïóñêó ñåğâèñîâ ñ êëş÷îì\n"
 "-noexpire."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9637,7 +9554,7 @@ msgstr ""
 "\n"
 "Ïàğàìåòğ ON ÿâëÿåòñÿ êîìáèíàöèåé çíà÷åíèé LOGON è NEW."
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9649,7 +9566,7 @@ msgstr ""
 "Ïîçâîëÿåò èçìåíèòü ïàğîëü íèêà, èñïîëüçóåìûé äëÿ èäåíòèôèêàöèè ê\n"
 "íåìó â êà÷åñòâå ïîëíîïğàâíîãî âëàäåëüöà."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9668,7 +9585,7 @@ msgstr ""
 "Ïğèìå÷àíèå: òåì íå ìåíåå, ëşáîé, êòî çíàåò âàø íèê, èìååò âîçìîæíîñòü\n"
 "ïîëó÷èòü èíôîğìàöèş î âàñ èñïîëüçóÿ êîìàíäó INFO."
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9700,7 +9617,7 @@ msgstr ""
 "Àêòèâèğîâàíèå äàííîé îïöèè ıêâèâàëåíòíî çàïóñêó ñåğâèñîâ ñ êëş÷îì\n"
 "-readonly."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9729,7 +9646,7 @@ msgstr ""
 "õîñòìàñêà, ñîâïàäàşùàÿ ñ âàøåé òåêóùåé. Ğåæèì îïöèè KILL ïğè ıòîì\n"
 "çíà÷åíèÿ íå èìååò."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9750,7 +9667,7 @@ msgstr ""
 "íåîáõîäèìîñòè. Îòêëş÷èòå åå ñğàçó, êàê òîëüêî ïåğåñòàíåòå íóæäàòüñÿ\n"
 "â íåé."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9772,7 +9689,7 @@ msgstr ""
 "íèêîâ óêàçàííîé ãğóïïû è íå áóäåò àâòîìàòè÷åñêè îáíîâëåí äëÿ íîâîãî\n"
 "íèêà, âíåñåííîãî â ãğóïïó óæå ïîñëå óñòàíîâêè âèğòóàëüíîãî õîñòà."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9782,7 +9699,7 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåğâèñû ñîõğàíèòü âñå áàçû äàííûõ è çàâåğøèòü ñâîş ğàáîòó."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9877,7 +9794,7 @@ msgstr ""
 "\n"
 "SNLINE CLEAR ïîçâîëÿåò  ïîëíîñòüş  î÷èñòèòü  ñïèñîê SNLINE'îâ."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9907,16 +9824,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Ñèíòàêñèñ: SOP #êàíàë ADD íèê\n"
 "           SOP #êàíàë DEL {íèê | íîìåğ çàïèñè | ñïèñîê_çàïèñåé}\n"
@@ -9959,7 +9866,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïğèâèëåãèé xOP ñì. ñïğàâî÷íóş èíôîğìàöèş\n"
 "ïî /msg %s HELP ACCESS è /msg %s HELP SET XOP."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -10057,7 +9964,7 @@ msgstr ""
 "\n"
 "SQLINE CLEAR ïîçâîëÿåò  ïîëíîñòüş  î÷èñòèòü  ñïèñîê SQLINE'îâ."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -10068,7 +9975,7 @@ msgstr ""
 "Âûâîäèò ñïèñîê ïğèâèëåãèğîâàííûõ íà ñåğâèñàõ ïîëüçîâàòåëåé (òàêèõ\n"
 "êàê Àäìèíèñòğàòîğû èëè Îïåğàòîğû ñåğâèñîâ) è èõ òåêóùèé ñòàòóñ."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -10080,7 +9987,7 @@ msgstr ""
 "Ïîçâîëÿåò îòïğàâèòü ìåìî-ñîîáùåíèå âñåì îïåğàòîğàì/àäìèíèñòğàòîğàì\n"
 "ñåğâèñîâ ñåòè."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -10129,7 +10036,7 @@ msgstr ""
 "Ïàğàìåòğ ALL âûâåäåò îáùóş ñòàòèñòèêó â êîìáèíàöèè ñ äàííûìè èç\n"
 "MEMORY è UPLINK."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -10153,7 +10060,7 @@ msgstr ""
 "\n"
 "    STATUS ERROR ñîîáùåíèå_îá_îøèáêå"
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -10198,7 +10105,7 @@ msgstr ""
 "âñå ëèøíèå áóäó ïğîèãíîğèğîâàíû. Åñëè ïàğàìåòğ íå óêàçàí - êîìàíäà\n"
 "âåğíåò âàø òåêóùèé ñòàòóñ íà ñåğâèñàõ."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -10221,7 +10128,7 @@ msgstr ""
 "Ïğèìå÷àíèå: â  çàâèñèìîñòè  îò  íàñòğîåê  ñåğâèñîâ,  ïğè÷èíà ìîæåò\n"
 "áûòü ïàğàìåòğîì êàê îïöèîíàëüíûì, òàê è íåîáõîäèìûì."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -10231,7 +10138,7 @@ msgstr ""
 "\n"
 "Ïîçâîëÿåò ïğèíóäèòåëüíî èçìåíèòü óêàçàííûé íèê íà íîâûé_íèê."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -10323,7 +10230,8 @@ msgstr ""
 "\n"
 "SZLINE CLEAR ïîçâîëÿåò  ïîëíîñòüş  î÷èñòèòü  ñïèñîê SZLINE'îâ."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -10348,24 +10256,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş, äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà òîëüêî\n"
 "âëàäåëüöåì êàíàëà."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Ñèíòàêñèñ: UMODE íèê ğåæèìû\n"
-"\n"
-"Ïîçâîëÿåò Àäìèíèñòğàòîğàì ñåğâèñîâ èçìåíÿòü ïîëüçîâàòåëüñêèå ğåæèìû\n"
-"(usermodes) ëşáîãî ïîñåòèòåëÿ ñåòè.   êà÷åñòâå  âòîğîãî ïàğàìåòğà\n"
-"êîìàíäû, âû äîëæíû óêàçàòü ğåæèìû  â òîì æå  ôîğìàòå,  â êîòîğîì\n"
-"óêàçûâàåòå ïğè ğó÷íîé óñòàíîâêå, ñ ïîìîùüş êîìàíäû /MODE.\n"
-"\n"
-"Äëÿ èñïîëüçîâàíèÿ ıòîé êîìàíäû íåîáõîäèìû ïğàâà Ñóïåğ-Àäìèíèñòğàòîğà."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10382,7 +10273,7 @@ msgstr ""
 "äàííûå è íàñòğîéêè êàíàëà áóäó ñîõğàíåíû. Â äàëüíåéøåì, ıòî ïîçâîëèò\n"
 "âàì ïåğåíàçíà÷èòü áîòà íà êàíàë ñ âîññòàíîâëåíèåì âñåõ ñòàğûõ íàñòğîåê."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, fuzzy, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10401,7 +10292,7 @@ msgstr ""
 "Ïî-óìîë÷àíèş,  äàííàÿ êîìàíäà ìîæåò áûòü èñïîëüçîâàíà AOP'àìè\n"
 "èëè ëèöàìè ñ óğîâíåì äîñòóïà 5 è âûøå."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10418,7 +10309,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10429,7 +10320,7 @@ msgstr ""
 "\n"
 "Ïîëíîñòüş âîññòàíàâëèâàåò àêòèâíîñòü ïğèîñòàíîâëåííîãî êàíàëà."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10440,7 +10331,7 @@ msgstr ""
 "\n"
 "Çàñòàâëÿåò ñåğâèñû íåìåäëåííî ñîõğàíèòü âñå áàçû äàííûõ íà äèñê."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10465,7 +10356,7 @@ msgstr ""
 "ñ ğåæèìîì +i, äàííûå êîòîğûõ ñîâïàäàşò ñ óêàçàííîé â êà÷åñòâå âòîğîãî\n"
 "ïàğàìåòğà õîñòìàñêîé."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10489,7 +10380,7 @@ msgstr ""
 "èëè ëèöàìè ñ óğîâíåì äîñòóïà 3 è âûøå (â ïîñëåäíåì ñëó÷àå - òîëüêî\n"
 "îòíîñèòåëüíî ñåáÿ)."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10518,16 +10409,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Ñèíòàêñèñ: VOP #êàíàë ADD íèê\n"
 "           VOP #êàíàë DEL {íèê | íîìåğ_çàïèñè | ñïèñîê_çàïèñåé}\n"
@@ -10569,7 +10450,7 @@ msgstr ""
 "êîìàíäû ACCESS è ñèñòåìû ïğèâèëåãèé xOP ñì. ñïğàâî÷íóş èíôîğìàöèş\n"
 "ïî /msg %s HELP ACCESS è /msg %s HELP SET XOP."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10585,7 +10466,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10596,7 +10477,7 @@ msgstr ""
 "Ïğèìå÷àíèå: â ğåæèìå ñàñïåíäà íèê èñêëş÷åí èç óñëîâèé èñòå÷åíèÿ ïî\n"
 "âğåìåíè."
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10604,7 +10485,7 @@ msgstr ""
 "Syntax: UNSUSPEND íèê\n"
 "Îñâîáîæäàåò íèê èç ğåæèìà ñàñïåíäà (çàìîğîçêè)."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10617,53 +10498,98 @@ msgstr ""
 "âñåõ êàíàëàõ, ãäå ó âàñ åñòü ñòàòóñ (ModeonID), îáíîâëÿåò âàøè\n"
 "âèğòóàëüíûå õîñòû è íàñòğîéêè (äàòà ïîñëåäíåãî ïîñåùåíèÿ IRC, è ò.ä.)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC #êàíàë [òåêñò_òîïèêà]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Î÷èñòêà îïğåäåëåííûõ ğåæèìîâ êàíàëà"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr ""
+"    NOOP        Âğåìåííîå óäàëåíèå âñåõ O:line'îâ ñ óêàçàííîãî\n"
+"                ñåğâåğà ñåòè"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Çàâåğøèòü ğàáîòó ñåğâèñîâ ñ ñîõğàíåíèåì áàçû äàííûõ"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Çàâåğøèòü ğàáîòó ñåğâèñîâ áåç ñîõğàíåíèÿ áàçû äàííûõ"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "Âîçìîæíîñòü óñòàíîâêè ğåæèìà IMMED â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "Ñïèñîê AKILL'îâ ïîëíîñòüş î÷èùåí."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "Óğîâåíü DEFCON òåïåğü ğàâåí %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Ñ ıòîãî ìîìåíòà, email-àäğåñ íèêà %s áóäåò ñêğûò èç èíôîğìàöèè ïî %s INFO."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr ""
 "Òåïåğü, email-àäğåñ íèêà %s áóäåò ïîêàçûâàòüñÿ â èíôîğìàöèè ïî %s INFO."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "Ñïèñîê SNLINE'îâ ïîëíîñòüş î÷èùåí."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "Ñïèñîê SQLINE'îâ ïîëíîñòüş î÷èùåí."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "Ñïèñîê SZLINE'îâ ïîëíîñòüş î÷èùåí."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "Êàíàë %s íå èìååò êëş÷à (no key)."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10676,40 +10602,40 @@ msgstr ""
 "êîìàíä/ôóíêöèé ğàñöåíèâàşòñÿ êàê ìèíèìàëüíûå (ìèíèìàëüíî íåîáõîäèìûé\n"
 "óğîâåíü äëÿ èñïîëüçîâàíèÿ)."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr ""
 "Êîëè÷åñòâî ñåññèé ñ õîñòà %s: %d, äîïóñòèìûé ìàêñèìóì äëÿ äàííîãî õîñòà: %d"
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr ""
 "Ïîñëåäíåå ñîîáùåíèå, êîòîğîå âû ïîñûëàëè äëÿ %s (à áûëî ıòî %s) óæå "
 "ïğî÷èòàíî."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr ""
 "Ïîñëåäíåå ñîîáùåíèå, êîòîğîå âû ïîñûëàëè äëÿ %s (à áûëî ıòî %s) åùå íå "
 "ïğî÷èòàíî."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr ""
 "Ïîñëåäíåå quit-ñîîáùåíèå äëÿ %s òåïåğü áóäåò ñêğûòî èç èíôîğìàöèè ïî %s INFO."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr ""
 "Ïîñëåäíåå quit-ñîîáùåíèå äëÿ %s òåïåğü áóäåò ïîêàçûâàòüñÿ â èíôîğìàöèè ïî %s "
 "INFO."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
@@ -10717,7 +10643,7 @@ msgstr ""
 "Ïîñëåäíÿÿ ìàñêà (èäåíò@õîñò) äëÿ %s òåïåğü áóäåò ñêğûòà èç èíôîğìàöèè ïî %s "
 "INFO."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
@@ -10725,34 +10651,22 @@ msgstr ""
 "Ïîñëåäíÿÿ ìàñêà (èäåíò@õîñò) äëÿ %s òåïåğü áóäåò ïîêàçûâàòüñÿ â èíôîğìàöèè "
 "ïî %s INFO."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "Ëèìèò ñîîáùåíèé äëÿ %s íå ìîæåò áûòü èçìåíåí."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr ""
-"Íîâûé ãëàâíûé íèê äëÿ %s äîëæåí áûòü çàğåãèñòğèğîâàííûì íèêîì è ñîñòîÿòü â "
-"åãî ãğóïïå!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Îñíîâíîé íèê ãğóïïû èçìåíåí íà %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "Íèê ïîëüçîâàòåëÿ %s áûë èçìåíåí íà %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
@@ -10760,19 +10674,19 @@ msgstr ""
 "Óğîâåíü äîñòóïà ê ñåğâèñàì äëÿ %s òåïåğü áóäåò ñêğûò èç èíôîğìàöèè ïî %s "
 "INFO."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "Óğîâåíü äîñòóïà ê ñåğâèñàì äëÿ %s òåïåğü áóäåò ïîêàçûâàòüñÿ â èíôîğìàöèè ïî %"
 "s INFO."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "%d ñîîáùåíèé íà êàíàëå %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10780,7 +10694,8 @@ msgstr ""
 "Ñïèñîê äîñòóïíûõ áîòîâ ïóñò.\n"
 "Ïî âîïğîñàì ñîçäàíèÿ áîòîâ îáğàùàéòåñü ê Àäìèíèñòğàòîğàì ñåğâèñîâ."
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10789,20 +10704,12 @@ msgstr ""
 "Ñëèøêîì ìíîãî íèêîâ â ãğóïïå %s. Ïğîâåğüòå ñïèñîê è óäàëèòå íåíóæíûå.\n"
 "Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè ñì. /msg %s HELP GLIST è /msg %s HELP DROP"
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "%d ñîîáùåíèå íà êàíàëå %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"Äëÿ êàíàëà %s ïğèøëî íîâîå ñîîáùåíèå.\n"
-"Íàïèøèòå /msg %s READ %s %d ÷òîáû ïğî÷èòàòü åãî."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "Áîò ñ êàíàëà %s óñïåøíî óäàëåí."
@@ -10823,7 +10730,7 @@ msgstr "Ñïèñîê ñëó÷àéíûõ íîâîñòåé ïóñò."
 msgid "There's no email address set for your nick."
 msgstr "Äëÿ âàøåãî íèêà íå óñòàíîâëåí email-àäğåñ."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10838,85 +10745,39 @@ msgstr ""
 "    PRIVATE       îãğàíè÷èòü óêàçàííîãî áîòà äî èñïîëüçîâàíèÿ åãî\n"
 "                  òîëüêî àäìèíèñòğàöèåé ñåòè."
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "Èñïîëüçîâàòü ıòîò êàíàë çàïğåùåíî àäìèíèñòğàöèåé ñåòè."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "İòîò êàíàë áûë çàğåãèñòğèğîâàí ñ ïîìîùüş %s"
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "Àêòèâíîñòü äàííîãî êàíàëà áûëà ïğèîñòàíîâëåíà àäìèíèñòğàöèåé ñåòè."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Èñïîëüçîâàíèå äàííîãî êàíàëà çàïğåùåíî."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Äîïîëíèòåëüíî: ğåãèñòğàöèÿ ıòîãî êàíàëà íèêîãäà íå èñòå÷åò."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"Ñ èñïîëüçóåìîãî âàìè íèêà óæå áûë ïîëó÷åí çàïğîñ íà ğåãèñòğàöèş. Åñëè "
-"ğåãèñòğàöèş çàïğàøèâàëè èìåííî âû, ïğîâåğüòå âàø e-mail íà ïğåäìåò ïîëó÷åíèÿ "
-"auth-êîäà."
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"İòîò íèê îæèäàåò ïîäòâåğæäåíèÿ ÷åğåç e-mail ïåğåä çàâåğøåíèåì ğåãèñòğàöèè."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Íèê, êîòîğûé âû ñåé÷àñ èñïîëüçóåòå, çàğåãèñòğèğîâàí íà ñåğâèñàõ ñåòè.\n"
-"Åñëè ıòî âàø íèê, èäåíòèôèöèğóéòåñü êîìàíäîé /msg %s IDENTIFY ïàğîëü\n"
-" ïğîòèâíîì ñëó÷àå - âûáåğèòå äğóãîé íèê."
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "İòîò íèê çàğåãèñòğèğîâàí êåì-òî äğóãèì, âû íå ìîæåòå åãî èñïîëüçîâàòü."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "Äîïîëíèòåëüíî: ıòîò íèê íàõîäèòñÿ â ğåæèìå ñàñïåíäà (çàìîğîæåí)."
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "Äîïîëíèòåëüíî: ıòîò íèê íàõîäèòñÿ â ğåæèìå ñàñïåíäà ïî ïğè÷èíå: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Íèê, êîòîğûé âû ñåé÷àñ èñïîëüçóåòå, çàğåãèñòğèğîâàí è çàùèùåí.\n"
-"Åñëè ıòî âàø íèê, èäåíòèôèöèğóéòåñü êîìàíäîé /msg %s IDENTIFY ïàğîëü.\n"
-"Èíà÷å, âûáåğèòå, ïîæàëóéñòà, äğóãîé íèê."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Äîïîëíèòåëüíî: ğåãèñòğàöèÿ ıòîãî íèêà íèêîãäà íå èñòå÷åò."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr ""
 "Âûáğàííûé âàìè íèê çàïğåùåí ê èñïîëüçîâàíèş. Âîçüìèòå êàêîé-íèáóäü äğóãîé."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Äîïîëíèòåëüíî: ğåãèñòğàöèÿ ıòîãî íèêà íèêîãäà íå èñòå÷åò."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10924,30 +10785,60 @@ msgstr ""
 "×òî áû íàéòè êàíàë, íà÷èíàşùèéñÿ ñ ñèìâîëà #, ïğîñòî óêàæèòå åãî\n"
 "íàçâàíèå áåç #. Íàïğèìåğ anope âìåñòî #anope."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           íàñòğîéêà ñèñòåìû ïğèâèëåãèé êàíàëà"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Áëîêèğîâêà òîïèêà"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Õğàíåíèå òîïèêà"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     áëîêèğîâêà òîïèêà êàíàëà îò èçìåíåíèé åãî êåì-ëèáî"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Ğåæèì áëîêèğîâêè òîïèêà äëÿ êàíàëà %s àêòèâèğîâàí."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
+#, fuzzy, c-format
+msgid "Topic lock option for %s is now on."
+msgstr "Ğåæèì áëîêèğîâêè òîïèêà äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Ğåæèì õğàíåíèÿ òîïèêà äëÿ êàíàëà %s àêòèâèğîâàí."
+
+#: modules/core/cs_set_keeptopic.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic retention option for %s is now on."
 msgstr "Ğåæèì õğàíåíèÿ òîïèêà äëÿ êàíàëà %s àêòèâèğîâàí."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Âûêëş÷è CapsLOCK!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     àêòèâèğîâàíèå/äåàêòèâèğîâàíèå ğåæèìà áåçîïàñíîñòè"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       àêòèâèğîâàíèå/äåàêòèâèğîâàíèå ğåæèìà çàùèòû"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10961,7 +10852,8 @@ msgstr ""
 "   Èçìåíèòü ıòè óñëîâèÿ âû ìîæåòå ñ ïîìîùüş òîíêîé íàñòğîéêè ÷åğåç\n"
 "   %s LEVELS."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10971,7 +10863,8 @@ msgstr ""
 "âîñïîëüçóéòåñü êîìàíäîé /msg %s HELP SASET îïöèÿ\n"
 "Ïîìíèòå, âû äîëæíû óêàçàòü íèê, îïöèè êîòîğîãî âû õîòèòå èçìåíèòü."
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10979,7 +10872,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10987,133 +10881,131 @@ msgstr ""
 "Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè î êàêîé-ëèáî êîíêğåòíîé îïöèè, ñì.\n"
 "ñïğàâêó ïî /msg %s HELP îïöèÿ"
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Èñïîëüçóéòå êîìàíäó /msg %s SET EMAIL email-àäğåñ ÷òîáû óñòàíîâèòü email-"
-"àäğåñ.\n"
-"Íå âîëíóéòåñü, äàííûé email-àäğåñ çíàòü áóäåòå ëèøü âû è Àäìèíèñòğàöèÿ ñåòè."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Íàïèøèòå /msg %s LIST NEW ÷òîáû ïîñìîòğåòü ñïèñîê ñîîáùåíèé."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Íàïèøèòå /msg %s READ %d ÷òîáû ïğî÷èòàòü åãî."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Íàïèøèòå /msg %s READ LAST ÷òîáû ïğî÷èòàòü åãî."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE íèê ğåæèìû"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Èñïîëüçóéòå êîìàíäó /msg %s SET EMAIL email-àäğåñ ÷òîáû óñòàíîâèòü email-"
+"àäğåñ.\n"
+"Íå âîëíóéòåñü, äàííûé email-àäğåñ çíàòü áóäåòå ëèøü âû è Àäìèíèñòğàöèÿ ñåòè."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN #êàíàë"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN #êàíàë [nick]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND #êàíàë"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND íèê"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Âûãğóçèòü ìîäóëü"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Íåâîçìîæíî çàãğóçèòü ìîäóëü %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Íåâîçìîæíî âûãğóçèòü ìîäóëü %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Ñíÿòü áîòà ñ óêàçàííîãî êàíàëà"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Íåèçâåñòíàÿ SASET-îïöèÿ %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Íåèçâåñòíàÿ SET-îïöèÿ %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Íåèçâåñòíûé STATS-ïàğàìåòğ %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Íåèçâåñòíàÿ êîìàíäà %s. Ñïèñîê êîìàíä äîñòóïåí ïî /msg %s HELP"
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Íåèçâåñòíûé ğåæèì %c - ïğîèãíîğèğîâàí."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Íåèçâåñòíàÿ îïöèÿ %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
-msgstr ""
-"Íåèçâåñòíàÿ îïöèÿ %s.\n"
-"Íàïèøèòå /msg %s HELP SET äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Ñíÿòèå ğåæèìà ñàñïåíäà ñ íèêà"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
+msgstr "    UPDATE     Îáíîâëåíèå âàøåãî òåêóùåãî ñòàòóñà íà ñåğâèñàõ"
+
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Îáíîâëåíèå áàç äàííûõ..."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink-ñåğâåğ: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Ïîëüçîâàòåëåé   : %6d çàïèñåé, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"Âàø íèê óñïåøíî îñâîáîæäåí îò èñïîëüçîâàíèÿ åãî äğóãèì ïîëüçîâàòåëåì ñåòè.\n"
-"×òîáû îñâîáîäèòü âàø íèê îò óäåğæàíèÿ åãî ñåğâèñàìè, èñïîëüçóéòå êîìàíäó\n"
-"/msg %s RELEASE %s èëè ïğîñòî íåìíîãî ïîäîæäèòå (âğåìÿ îæèäàíèÿ: %s)."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr ""
 "Îäíà èç ìàñîê â ñïèñêå èñêëş÷åíèé êàíàëà ñîâïàäàåò ñ õîñòìàñêîé óêàçàííîãî "
 "ïîëüçîâàòåëÿ. ×òîáû çàáàíèòü åãî, âû äîëæíû óäàëèòü èñêëş÷åíèÿ."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -11121,16 +11013,35 @@ msgstr ""
 "Ñïèñîê ïîëüçîâàòåëåé:\n"
 "Íèê                  Ìàñêà"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "Âñå ïğàâà íà âëàäåíèå êàíàëîì %s óñïåøíî ïåğåäàíû ïîëüçîâàòåëş %s."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Ïğîñìîòğ êîëè÷åñòâà ñåññèé ñ óêàçàííîãî õîñòà"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Óñòàíîâêà ñòàòóñà âîéñà (+v) óêàçàííîìó íèêó íà êàíàëå"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Íå êèêàòü âîéñîâ"
 
@@ -11157,16 +11068,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Ñëåäè çà ñâîèì ÿçûêîì!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Âû óæå ñîñòîèòå â ãğóïïå %s."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "Âû óæå èäåíòèôèöèğîâàíû."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -11175,11 +11086,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "Ğåæèì Ñóïåğ-Àäìèíèñòğàòîğà äåàêòèâèğîâàí."
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Âàì íå ğàçğåøåíî íàõîäèòüñÿ íà ıòîì êàíàëå."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Âàì çàïğåùåíî èçìåíÿòü ñâîé ëèìèò ñîîáùåíèé."
 
@@ -11187,11 +11094,12 @@ msgstr "Âàì çàïğåùåíî èçìåíÿòü ñâîé ëèìèò ñîîáùåíèé."
 msgid "You are now a SuperAdmin"
 msgstr "Ğåæèì Ñóïåğ-Àäìèíèñòğàòîğà àêòèâèğîâàí."
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "Òåïåğü âû IRC-îïåğàòîğ."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -11199,44 +11107,45 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "Âû óñïåøíî âíåñåíû â ãğóïïó %s."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr ""
 "Âû íå ìîæåòå çàïğîñèòü èíôîğìàöèş î ïîëó÷åíèè, êîãäà ïîñûëàåòå ñîîáùåíèå "
 "ñåáå."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Âû íå ìîæåòå çàêğûòü ñâîş ñåññèş!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Íåâîçìîæíî äåèäåíòèôèöèğîâàòü %s òàê êàê îí Àäìèíèñòğàòîğ ñåğâèñîâ."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr ""
 "İıı... âû íå ìîæåòå èñïîëüçîâàòü êîìàíäó RECOVER îòíîñèòåëüíî ñàìîãî ñåáÿ."
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -11247,7 +11156,8 @@ msgstr ""
 "Äëÿ ìîäèôèêàöèè ñïèñêà äîñòóïà èñïîëüçóéòå êîìàíäû VOP, AOP è SOP.\n"
 "Áîëåå ïîäğîáíàÿ èíôîğìàöèÿ äîñòóïíà ïî /msg %s HELP êîìàíäà"
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -11259,6 +11169,7 @@ msgstr ""
 "Áîëåå ïîäğîáíàÿ èíôîğìàöèÿ äîñòóïíà ïî /msg %s HELP êîìàíäà"
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -11266,57 +11177,67 @@ msgstr ""
 "Âû íå ìîæåòå èñïîëüçîâàòü ıòó êîìàíäó, âìåñòî íåå èñïîëüçóéòå ACCESS.\n"
 "Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè ñì. /msg %s HELP ACCESS"
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "Âû íå ìîæåòå óñòàíîâèòü ëèìèò ñîîáùåíèé äëÿ %s áîëüøå ÷åì %d."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Âû íå ìîæåòå óñòàíîâèòü ëèìèò ñîîáùåíèé áîëüøå ÷åì %d."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "Âîçìîæíîñòü óäàëåíèÿ email-àäğåñà â âàøåé IRC-ñåòè íåäîñòóïíà."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, %d èç íèõ íå ïğî÷èòàíî."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, 1 èç íèõ íå ïğî÷èòàíî."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr ""
 "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ %d ñîîáùåíèé, íè îäíî èç íèõ íå ïğî÷èòàíî."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ 1 íîâîå, íåïğî÷èòàííîå ñîîáùåíèå."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Íà äàííûé ìîìåíò ó âàñ èìååòñÿ 1 ñîîáùåíèå."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Íà äàííûé ìîìåíò ó âàñ íåò ñîîáùåíèé."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -11326,64 +11247,45 @@ msgstr "Âàì ïğèøëî %d íîâûõ ñîîáùåíèé."
 msgid "You have 1 new memo."
 msgstr "Âàì ïğèøëî 1 íîâîå ñîîáùåíèå."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"Âàì ïğèøëî íîâîå ñîîáùåíèå îò %s.\n"
-"Íàïèøèòå /msg %s READ %d ÷òîáû ïğî÷èòàòü åãî."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "Âû áûëè ğàçáàíåíû íà êàíàëå %s."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Ó âàñ íåò îãğàíè÷åíèÿ íà êîëè÷åñòâî õğàíèìûõ ñîîáùåíèé."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Âàø ñïèñîê ìåìî-ñîîáùåíèé ïóñò."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Ó âàñ íåò íîâûõ ñîîáùåíèé."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "Çíà÷åíèå ïàğàìåòğà \"âğåìÿ\" óêàçàíî íå âåğíî."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
-msgstr ""
-"Ïåğåä òåì, êàê èñïîëüçîâàòü ıòó êîìàíäó, âû äîëæíû íàçíà÷èòü áîòà íà\n"
-"êàíàë. Äëÿ áîëåå ïîäğîáíîé èíôîğìàöèè ñì.  /msg %s HELP ASSIGN."
-
-#: modules/core/cs_register.cpp:48
+#: modules/core/cs_register.cpp:47
 msgid "You must be a channel operator to register the channel."
 msgstr "×òîáû çàğåãèñòğèğîâàòü êàíàë, âû äîëæíû áûòü åãî îïåğàòîğîì."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
+msgstr "×òîáû çàğåãèñòğèğîâàòü êàíàë, âû äîëæíû áûòü åãî îïåğàòîğîì."
+
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
 "×òîáû íà÷àòü ğåãèñòğàöèş âàøåãî òåêóùåãî íèêà, âû äîëæíû èñïîëüçîâàòü åãî íå "
 "ìåíåå %d ñåêóíä"
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11394,26 +11296,26 @@ msgstr ""
 "ïîçâîëèò âàì èñïîëüçîâàòü ôóíêöèş âîññòàíîâëåíèÿ ïàğîëÿ, åñëè âû åãî "
 "çàáóäåòå."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñğàçó ïîñëå èäåíòèôèêàöèè ê íèêó èëè "
 "ïğè ïîñòóïëåíèè íîâûõ ñîîáùåíèé."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr ""
 "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñğàçó ïîñëå èäåíòèôèêàöèè ê íèêó"
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Âû áóäåòå óâåäîìëåíû î íîâûõ ñîîáùåíèÿõ ñğàçó ïğè ïîñòóïëåíèè îíûõ."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Ëèìèò ñîîáùåíèé óñòàíîâëåí íà 0, âîçìîæíîñòü èõ ïîëó÷åíèÿ îòêëş÷åíà."
 
@@ -11421,7 +11323,7 @@ msgstr "Ëèìèò ñîîáùåíèé óñòàíîâëåí íà 0, âîçìîæíîñòü èõ ïîëó÷åíèÿ îòêëş÷åíà."
 msgid "You will no longer be informed via email."
 msgstr "Îïîâåùåíèå î íîâûõ ñîîáùåíèÿõ ïîñğåäñòâîì email îòêëş÷åíî"
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Óâåäîìëåíèå î íîâûõ ñîîáùåíèÿõ îòêëş÷åíî."
 
@@ -11430,18 +11332,20 @@ msgid "You will now be informed about new memos via email."
 msgstr ""
 "Ñ ıòîãî ìîìåíòà, âû áóäåòå ïîëó÷àòü óâåäîìëåíèÿ î íîâûõ ñîîáùåíèÿõ ïî email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"IRCd âàøåé ñåòè íå ïîääåğæèâàåò âèğòóàëüíûå èäåíòû. Åñëè ıòî íå òàê, "
-"ñîîáùèòå íàì (ğàçğàáîò÷êàì) î äàííîì ôàêòå."
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Âàø ñïèñîê äîñòóïà ïóñò."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "Âû óæå èäåíòèôèöèğîâàíû."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11457,35 +11361,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Âàø ñïèñîê äîñòóïà ïóñò."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "Email-àäğåñ äëÿ %s èçìåíåí íà %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "Âñå OLINE-çàïèñè íà ñåğâåğå %s áûëè óäàëåíû."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Ñïèñîê èãíîğèğóåìûõ íèêîâ ïóñò."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Ëèìèòèòèğîâàíèå âàøåãî ñïèñêà ñîîáùåíèé îòêëş÷åíî."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Ëèìèò ñîîáùåíèé áûë óñòàíîâëåí íà %d."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Âàø ëèìèò ñîîáùåíèé ğàâåí %d è íå ìîæåò áûòü èçìåíåí."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Âàø ëèìèò ñîîáùåíèé ğàâåí %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Âàø ëèìèò ñîîáùåíèé ğàâåí 0 è ïğèíèìàòü èõ âû íå ìîæåòå."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11493,64 +11418,59 @@ msgstr ""
 "Âàø ëèìèò ñîîáùåíèé ğàâåí 0, ó âàñ íåò âîçìîæíîñòè ïğèíèìàòü ñîîáùåíèÿ è/èëè "
 "èçìåíÿòü ëèìèò."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Äåèäåíòèôèêàöèÿ âûïîëíåíà óñïåøíî."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr ""
 "Ïåğåä âíåñåíèåì íèêà â ãğóïïó, âû äîëæíû óäàëèòü åãî êîìàíäîé /msg %s DROP."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Âàø íèê íåçàğåãèñòğèğîâàí."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Âàø íèê óñïåøíî óäàëåí èç áàçû äàííûõ ñåğâèñîâ."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Âàø íèê èçìåíåí íà %s"
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Âàø êîä àóòåíôèêàöèè áûë çàíîâî âûñëàí íà %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 "Ïàğîëü äëÿ âàøåãî íèêà - %s - çàïîìíèòå åãî, îí ïğèãîäèòñÿ âàì â äàëüíåéøåì!"
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr ""
-"Âû óêàçàëè ñëèøêîì äëèííûé ïàğîëü, ïîïğîáóéòå åùå ğàç ñ áîëåå êîğîòêèì."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Âàø âèğòóàëüíûé õîñò %s àêòèâèğîâàí."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Âàø âèğòóàëüíûé õîñò %s@%s àêòèâèğîâàí."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11569,94 +11489,95 @@ msgstr "[Îïåğ-íîâîñòè - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Ñëó÷àéíàÿ íîâîñòü - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "íèêîãäà íå èñòå÷åò"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "èñòåêàåò ïğè áëèæàéøåì îáíîâëåíèè ÁÄ"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "èñòå÷åò ÷åğåç %d äíåé"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "èñòå÷åò ÷åğåç %d äíåé"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "èñòå÷åò ÷åğåç %d ÷àñîâ %d ìèíóò"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "èñòå÷åò ÷åğåç %d ÷àñîâ, %d ìèíóò"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "èñòå÷åò ÷åğåç %d ÷àñîâ, %d ìèíóò"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "èñòå÷åò ÷åğåç %d ÷àñîâ, %d ìèíóò"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "èñòå÷åò ÷åğåç %d ìèíóò"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "èñòå÷åò ÷åğåç %d ìèíóò"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "Âèğòóàëüíûé õîñò äëÿ %s óäàëåí."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "Âèğòóàëüíûé õîñò äëÿ %s óñòàíîâëåí íà %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "Âèğòóàëüíûé õîñò äëÿ %s óñòàíîâëåí íà %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "Âèğòóàëüíûé õîñò äëÿ ãğóïïû %s óñòàíîâëåí íà %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "Âèğòóàëüíûé õîñò äëÿ ãğóïïû %s óñòàíîâëåí â %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "Âñå âèğòóàëüíûå õîñòû äëÿ ãğóïïû %s áûëè óäàëåíû."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "Ñèñòåìà ïğèâåëåãèé xOP"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "Ñèñòåìà ïğèâåëåãèé xOP äëÿ êàíàëà %s àêòèâèğîâàíà."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "Ñèñòåìà ïğèâåëåãèé xOP äëÿ êàíàëà %s àêòèâèğîâàíà."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "Ñèñòåìà ïğèâåëåãèé xOP íåäîñòóïíà."
 
@@ -11665,567 +11586,3 @@ msgstr "Ñèñòåìà ïğèâåëåãèé xOP íåäîñòóïíà."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {íèê | #êàíàë} òåêñò_ñîîáùåíèÿ"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s óñïåøíî äîáàâëåí â AOP'û êàíàëà %s."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s óñïåøíî äîáàâëåí â HOP'û êàíàëà %s."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s óñïåøíî äîáàâëåí â SOP'û êàíàëà %s."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s óñïåøíî äîáàâëåí â VOP'û êàíàëà %s."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s óñïåøíî óäàëåí èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s óñïåøíî óäàëåí èç SOP'îâ êàíàëà %s."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s óñïåøíî óäàëåí èç VOP'îâ êàíàëà %s."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s ïåğåìåùåí â HOP'û êàíàëà %s."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s ïåğåìåùåí â SOP'û êàíàëà %s."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s ïåğåìåùåí â VOP'û êàíàëà %s."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "Íèê %s â ñïèñêå HOP'îâ êàíàëà %s íå îáíàğóæåí."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "Íèê %s â ñïèñêå SOP'îâ êàíàëà %s íå îáíàğóæåí."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "Íèê %s â ñïèñêå VOP'îâ êàíàëà %s íå îáíàğóæåí."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   âûáîğ ÿçûêà, ïîñğåäñòâîì êîòîğîãî ñåğâèñû áóäóò ñ\n"
-#~ "               óêàçàííûì íèêîì."
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr "    PRIVATE    ñêğûòèå âàøåãî íèêà â ñïèñêå íèêîâ ïî /msg %s LIST"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d äíåé"
-
-#~ msgid "%d hours"
-#~ msgstr "%d ÷àñîâ"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d ìèíóò"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d ñåêóíä"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "Ñïèñîê HOP'îâ êàíàëà %s ïóñò."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "Ñïèñîê SOP'îâ êàíàëà %s ïóñò."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "Ñïèñîê VOP'îâ êàíàëà %s ïóñò."
-
-#~ msgid "1 day"
-#~ msgstr "1 äåíü"
-
-#~ msgid "1 hour"
-#~ msgstr "1 ÷àñ"
-
-#~ msgid "1 minute"
-#~ msgstr "1 ìèíóòà"
-
-#~ msgid "1 second"
-#~ msgstr "1 ñåêóíäà"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "Óğîâåíü äîñòóïà ê êîìàíäå CLEAR"
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "Óğîâåíü äîñòóïà ê êîìàíäàì HALFOP/DEHALFOP"
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Ñïèñîê HOP'îâ êàíàëà %s áûë ïîëíîñòüş î÷èùåí."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Ñïèñîê SOP'îâ êàíàëà %s áûë ïîëíîñòüş î÷èùåí."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Ñïèñîê VOP'îâ êàíàëà %s áûë ïîëíîñòüş î÷èùåí."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà SOP'îâ êàíàëà %s."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "Óäàëåíî %d çàïèñåé èç ñïèñêà VOP'îâ êàíàëà %s."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà HOP'îâ êàíàëà %s."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà SOP'îâ êàíàëà %s."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "Óäàëåíà 1 çàïèñü èç ñïèñêà VOP'îâ êàíàëà %s."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "Email-àäğåñ äëÿ âàøåãî íèêà óäàëåí."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP #êàíàë {ADD|DEL|LIST|CLEAR} [íèê | íîìåğ çàïèñ]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Êîíåö ñïèñêà ïîëüçîâàòåëåé."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "Ñîîáùåíèå ïğè âõîäå íà êàíàë %s óäàëåíî."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Íà äàííûé ìîìåíò, áîò íå ïğèñóòñòâóåò íà êàíàëå %s."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "Ñîîáùåíèå ïğè âõîäå.......: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Ñïèñîê äîñòóïà äëÿ %s ïóñò."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "Ñïèñîê äîñòóïà äëÿ %s:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "Ñîîáùåíèå ïğè âõîäå íà êàíàë %s èçìåíåíî."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "FANTASY-ğåæèì äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Ğåæèì ïğèâåòñòâèé äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ñïèñîê HOP'îâ êàíàëà %s:\n"
-#~ "  Íîìåğ  Íèê"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Âíóòğåííÿÿ îøèáêà - íåâîçìîæíî âûïîëíèòü çàïğîñ."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Íîâîñòü ïîä íîìåğîì #%d óäàëåíà."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Íèê %s íå çàğåãèñòğèğîâàí."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Ğåãèñòğàöèÿ íèêà %s"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Ïàğîëü äëÿ íèêà %s"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "Âû íå óêàçàëè ñèìâîë '#' ïåğåä íàçâàíèåì êàíàëà."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Ğåæèì áåç-áîòà äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "Ñîâïàäàşùèõ çàïèñåé â ñïèñêå HOP'îâ êàíàëà %s íå îáíàğóæåíî."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "Ñîâïàäàşùèõ çàïèñåé â ñïèñêå SOP'îâ êàíàëà %s íå îáíàğóæåíî."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "Ñîâïàäàşùèõ çàïèñåé â ñïèñêå VOP'îâ êàíàëà %s íå îáíàğóæåíî."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "Çàïèñü ïîä íîìåğîì #%d â ñïèñêå AOP'îâ êàíàëà %s íå îáíàğóæåíà."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "Çàïèñü ïîä íîìåğîì #%d â ñïèñêå HOP'îâ êàíàëà %s íå îáíàğóæåíà."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "Çàïèñü ïîä íîìåğîì #%d â ñïèñêå SOP'îâ êàíàëà %s íå îáíàğóæåíà."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "Çàïèñü ïîä íîìåğîì #%d â ñïèñêå VOP'îâ êàíàëà %s íå îáíàğóæåíà."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Ğåæèì OP-óâåäîìëåíèé äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Ğåæèì ñïîêîéñòâèÿ äëÿ êàíàëà %s îòêëş÷åí."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr ""
-#~ "Ïîæàëóéñòà, ïîäîæäèòå %d ñåêóíä ïåğåä ïîâòîğíûì èñïîëüçîâàíèåì "
-#~ "êîìàíäû SEND."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "Ğåæèì ïğèâàòíûé óñïåøíî ñíÿò ñ áîòà ïîä íèêîì %s"
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Ğåæèì ïğèâàòíîñòè êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Ğåæèì ïğèâàòíîñòè äëÿ %s îòêëş÷åí."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Çàùèòà íèêà %s îòêëş÷åíà."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Çàùèòà íèêà àêòèâèğîâàíà, ëèìèò âğåìåíè íà ââîä ïàğîëÿ: 0 ñåêóíä."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER ïàğîëü [email]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Ğåæèì îãğàíè÷åííîãî äîñòóïà íà êàíàë %s îòêëş÷åí."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ñïèñîê SOP'îâ êàíàëà %s:\n"
-#~ " Íîìåğ  Íèê"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Êàíàë %s íåçàğåãèñòğèğîâàí"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND #êàíàë [ïğè÷èíà]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Ğåæèì áåçîïàñíîñòè âëàäåëüöà äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Ğåæèì êîíòğîëÿ çà ñòàòóñîì îïåğàòîğà äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Ğåæèì áåçîïàñíîñòè äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Ğåæèì áåçîïàñíîñòè äëÿ %s îòêëş÷åí."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Âîçìîæíîñòü èçìåíÿòü ğåæèìû ñåğâèñàì íåäîñòóïíà. Âû âîîáùå óâåğåíû, ÷òî "
-#~ "íàñòğîéêè âàøèõ ñåğâåğîâ êîğğåêòíû?"
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d äåíü, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ÷àñ, %d ìèíóòó"
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ÷àñ, %d ìèíóò"
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ÷àñ, %d ìèíóò"
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ìèíóòó, %d ñåêóíäó"
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ìèíóòó, %d ñåêóíä"
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Ñåğâèñû ğàáîòàşò: %d ìèíóò, %d ñåêóíäó"
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Ğåæèì ïîäïèñàííûõ êèêîâ äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà HOP'îâ âğåìåííî íåäîñòóïíà."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà SOP'îâ âğåìåííî íåäîñòóïíà."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr ""
-#~ "Èçâèíèòå, íî âîçìîæíîñòü ìîäèôèêàöèè ñïèñêà VOP'îâ âğåìåííî íåäîñòóïíà."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr ""
-#~ "Èçâèíèòå, íî êîëè÷åñòâî VOP/HOP/AOP/SOP-çàïèñåé íå ìîæåò ïåğâûøàòü %d "
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Ğåæèì ñèìáèîçà äëÿ êàíàëå %s îòêëş÷åí."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Ñèíòàêñèñ: RANDOMNEWS ADD òåêñò"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR #êàíàë ÷òî_èìåííî"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Ñèíòàêñèñ: OPERNEWS ADD òåêñò"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Ñèíòàêñèñ: SET DEBUG {ON | OFF | óğîâåíü}\n"
-#~ "\n"
-#~ "Âêëş÷àåò èëè âûêëş÷àåò îòëàäî÷íûé ğåæèì ğàáîòû ñåğâèñîâ. Àêòèâàöèÿ\n"
-#~ "äàííîãî ğåæèìà ïîçâîëèò áîëåå äåòàëüíî ëîãèğîâàòü ğàáîòó ñåğâèñîâ,\n"
-#~ "â ÷àñòíîñòè - çàïèñûâàòü â ëîã âñå ïîñëàííûå è ïğèíÿòûå ñåğâèñàìè\n"
-#~ "äàííûå, è îïåğàöèè ñ ıòèìè ñàìûìè äàííûìè.  êà÷åñòâå ïàğàìåòğà âû\n"
-#~ "ìîæååò óêàçàòü óğîâåíü äåòàëüíîñòü îòëàäî÷íîãî ğåæèìà, ÷åì âûøå\n"
-#~ "óğîâåíü - òåì áîëåå äåòàëüíûìè (è îáüåìíûìè, õåõ) áóäóò ëîãè.\n"
-#~ "\n"
-#~ "Àêòèâèğîâàíèå äàííîé îïöèè ıêâèâàëåíòíî çàïóñêó ñåğâèñîâ ñ êëş÷îì\n"
-#~ "-debug."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Ñèíòàêñèñ: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Ïğèâåòñòâèå äëÿ %s óäàëåíî."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "İòîò ìîäóëü íå ìîæåò áûòü âûãğóæåí."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Ğåæèì áëîêèğîâêè òîïèêà äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Ğåæèì õğàíåíèÿ òîïèêà äëÿ êàíàëà %s îòêëş÷åí."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Íåèçâåñòíàÿ êîìàíäà %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Íåèçâåñòíàÿ îïöèÿ %s.\n"
-#~ "Èñïîëüçóéòå /msg %s HELP KICK äëÿ ïîëó÷åíèÿ áîëåå ïîëíîé èíôîğìàöèè."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "Ïîëüçîâàòåëü %s íå íàéäåí â ñåğâèñíîé áàçå äàííûõ íèêîâ."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "Ñïèñîê VOP'îâ êàíàëà %s:\n"
-#~ " Íîìåğ  Íèê"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr ""
-#~ "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîğûå âû ïîñûëàëè %s, áûëî ïğî÷èòàíî."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr ""
-#~ "[àâòî-ñîîáùåíèå] Ìåìî-ñîîáùåíèå, êîòîğûå âû ïîñûëàëè %s, áûëî ïğî÷èòàíî."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "Ïîñëåäíåå âàøå ñîîáùåíèå àäğåñàòó %s óñïåøíî îòìåíåíî."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Âàø âèğòóàëüíûé õîñò %s àêòèâèğîâàí."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "Áîò ïîä íèêîì %s óñïåøíî óäàëåí."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "Ñèñòåìà ïğèâåëåãèé xOP äëÿ êàíàëà %s îòêëş÷åíà."
diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po
index 7bbe9b5c6..16ce3db64 100644
--- a/language/anope.tr_TR.po
+++ b/language/anope.tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 15:27-0500\n"
+"POT-Creation-Date: 2011-03-29 13:44-0400\n"
 "PO-Revision-Date: 2010-09-19 21:13-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Turkish\n"
@@ -16,11 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: include/language.h:11
-msgid "%s%s HELP %s for more information."
-msgstr "Daha fazla bilgi için /msg %s HELP %s yazınız."
+#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:104
+#, c-format
+msgid "%s Changed the DEFCON level to %d"
+msgstr "%s Changed the DEFCON level to %d"
+
+#: modules/core/cs_access.cpp:244
+#, c-format
+msgid "%s added to %s access list at level %d."
+msgstr "%s nicki %s kanalinin access listesine %d seviyeden eklendi."
+
+#: modules/core/cs_akick.cpp:280
+#, c-format
+msgid "%s added to %s autokick list."
+msgstr "%s nicki %s kanalının akick listesine eklendi."
+
+#: modules/core/bs_badwords.cpp:174
+#, c-format
+msgid "%s added to %s bad words list."
+msgstr "%s %s kanalının küfür listesine eklendi."
 
-#: modules/core/ns_help.cpp:33
+#: modules/core/os_akill.cpp:196
+#, c-format
+msgid "%s added to the AKILL list."
+msgstr "%s AKILL listesine eklendi."
+
+#: modules/core/os_snline.cpp:210
+#, c-format
+msgid "%s added to the SNLINE list."
+msgstr "%s SNLINE listesinde eklendi."
+
+#: modules/core/os_sqline.cpp:190
+#, c-format
+msgid "%s added to the SQLINE list."
+msgstr "%s SQLINE listesine eklendi."
+
+#: modules/core/os_szline.cpp:194
+#, c-format
+msgid "%s added to the SZLINE list."
+msgstr "%s SZLINE listesine eklendi."
+
+#: modules/core/ns_access.cpp:70
+#, c-format
+msgid "%s added to your access list."
+msgstr "%s access listenize eklendi."
+
+#: modules/core/ns_cert.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your certificate list"
+msgstr "%s access listenize eklendi."
+
+#: modules/core/ns_cert.cpp:72
+#, fuzzy, c-format
+msgid "%s added to your certificate list."
+msgstr "%s access listenize eklendi."
+
+#: modules/core/ms_ignore.cpp:55
+#, fuzzy, c-format
+msgid "%s added to your ignore list."
+msgstr "%s access listenize eklendi."
+
+#: modules/core/ns_help.cpp:34
+#, fuzzy, c-format
 msgid ""
 "%s allows you to \"register\" a nickname and\n"
 "prevent others from using it. The following\n"
@@ -35,15 +92,16 @@ msgstr ""
 "/msg %s komut yazın. Belirli bir komut hakkında daha \n"
 "fazla bilgi için, /msg %s HELP komut yazın."
 
-#: modules/core/bs_help.cpp:35
+#: modules/core/bs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to have a bot on your own channel.\n"
 "It has been created for users that can't host or\n"
 "configure a bot, or for use on networks that don't\n"
 "allow user bots. Available commands are listed \n"
-"below; to use them, type %s%s command.  For \n"
-"more information on a specific command, type %s\n"
-"%s HELP command."
+"below; to use them, type %s%s command. For\n"
+"more information on a specific command, type\n"
+"%s%s HELP command."
 msgstr ""
 "%s kanalınızda bir botunuzun olmasını sağlar. Bu\n"
 "servis bot konfigürasyonundan anlamayanlar yada\n"
@@ -53,8 +111,8 @@ msgstr ""
 "daha fazla bilgi için, /msg %s HELP komut\n"
 "yazın."
 
-#: modules/core/cs_help.cpp:35
-#, fuzzy
+#: modules/core/cs_help.cpp:36
+#, fuzzy, c-format
 msgid ""
 "%s allows you to register and control various\n"
 "aspects of channels. %s can often prevent\n"
@@ -73,123 +131,56 @@ msgstr ""
 "/msg %s HELP komut yazın.\n"
 " "
 
-#: modules/core/ms_help.cpp:33
-#, fuzzy, c-format
-msgid ""
-"%s is a utility allowing IRC users to send short\n"
-"messages to other IRC users, whether they are online at\n"
-"the time or not, or to channels(*). Both the sender's\n"
-"nickname and the target nickname or channel must be\n"
-"registered in order to send a memo.\n"
-"%s's commands include:"
-msgstr ""
-"%s kullanıcıların birbirlerine veya kanallara(*) online \n"
-"olmasalar bile mesaj göndermelerini sağlar. Mesaj gönderebilmek\n"
-"için gönderenin nicki, gönderilenin nicki veya kanalın kayıtlı\n"
-"olması gereklidir.\n"
-"\n"
-"%s'ün mevcut komutları:"
-
-#: modules/core/os_defcon.cpp:36 modules/core/os_defcon.cpp:96
-#, c-format
-msgid "%s Changed the DEFCON level to %d"
-msgstr "%s Changed the DEFCON level to %d"
-
-#: modules/core/cs_access.cpp:238
-#, c-format
-msgid "%s added to %s access list at level %d."
-msgstr "%s nicki %s kanalinin access listesine %d seviyeden eklendi."
-
-#: modules/core/cs_akick.cpp:281
-#, c-format
-msgid "%s added to %s autokick list."
-msgstr "%s nicki %s kanalının akick listesine eklendi."
-
-#: modules/core/bs_badwords.cpp:174
-#, c-format
-msgid "%s added to %s bad words list."
-msgstr "%s %s kanalının küfür listesine eklendi."
-
-#: modules/core/os_akill.cpp:196
-#, c-format
-msgid "%s added to the AKILL list."
-msgstr "%s AKILL listesine eklendi."
-
-#: modules/core/os_snline.cpp:210
-#, c-format
-msgid "%s added to the SNLINE list."
-msgstr "%s SNLINE listesinde eklendi."
-
-#: modules/core/os_sqline.cpp:190
-#, c-format
-msgid "%s added to the SQLINE list."
-msgstr "%s SQLINE listesine eklendi."
-
-#: modules/core/os_szline.cpp:194
-#, c-format
-msgid "%s added to the SZLINE list."
-msgstr "%s SZLINE listesine eklendi."
-
-#: modules/core/ns_access.cpp:70
-#, c-format
-msgid "%s added to your access list."
-msgstr "%s access listenize eklendi."
-
-#: modules/core/ms_ignore.cpp:54
-#, fuzzy, c-format
-msgid "%s added to your ignore list."
-msgstr "%s access listenize eklendi."
-
 #: modules/core/bs_badwords.cpp:165
 #, c-format
 msgid "%s already exists in %s bad words list."
 msgstr "%s zaten %s kanalının küfür listesinde var."
 
-#: modules/core/cs_akick.cpp:260
+#: modules/core/cs_akick.cpp:259
 #, c-format
 msgid "%s already exists on %s autokick list."
 msgstr "%s nicki %s kanalının akick listesinde zaten var."
 
-#: src/operserv.cpp:508
+#: src/operserv.cpp:500
 #, c-format
 msgid "%s already exists on the AKILL list."
 msgstr "%s zaten AKILL listesinde."
 
-#: src/sessions.cpp:266
+#: src/sessions.cpp:267
 #, c-format
 msgid "%s already exists on the EXCEPTION list."
 msgstr "%s already exists on the EXCEPTION list."
 
-#: src/operserv.cpp:576
+#: src/operserv.cpp:570
 #, c-format
 msgid "%s already exists on the SNLINE list."
 msgstr "%s zaten SNLINE listesinde."
 
-#: src/operserv.cpp:686
+#: src/operserv.cpp:682
 #, c-format
 msgid "%s already exists on the SQLINE list."
 msgstr "%s zaten SQLINE listesinde mevcut."
 
-#: src/operserv.cpp:811
+#: src/operserv.cpp:809
 #, c-format
 msgid "%s already exists on the SZLINE list."
 msgstr "%s zaten SZLINE listesinde."
 
-#: modules/core/bs_kick.cpp:64 modules/core/bs_kick.cpp:97
-#: modules/core/bs_kick.cpp:130 modules/core/bs_kick.cpp:178
-#: modules/core/bs_kick.cpp:211 modules/core/bs_kick.cpp:258
-#: modules/core/bs_kick.cpp:299 modules/core/bs_kick.cpp:329
-#: modules/core/bs_kick.cpp:359
+#: modules/core/bs_kick.cpp:66 modules/core/bs_kick.cpp:103
+#: modules/core/bs_kick.cpp:139 modules/core/bs_kick.cpp:194
+#: modules/core/bs_kick.cpp:231 modules/core/bs_kick.cpp:287
+#: modules/core/bs_kick.cpp:333 modules/core/bs_kick.cpp:366
+#: modules/core/bs_kick.cpp:400 modules/core/bs_kick.cpp:434
 #, c-format
 msgid "%s cannot be taken as times to ban."
 msgstr "%s değeri kullanılamaz."
 
-#: modules/core/os_umode.cpp:47
-#, c-format
-msgid "%s changed your usermodes."
+#: modules/core/os_mode.cpp:54
+#, fuzzy, c-format
+msgid "%s changed your usermodes to %s."
 msgstr "%s changed your usermodes."
 
-#: modules/core/os_chanlist.cpp:38
+#: modules/core/os_chanlist.cpp:39
 #, c-format
 msgid ""
 "%s channel list:\n"
@@ -203,42 +194,42 @@ msgstr ""
 msgid "%s deleted from %s %s list."
 msgstr "%s %s kanali AOP listesinden silindi."
 
-#: modules/core/cs_access.cpp:268
+#: modules/core/cs_access.cpp:274
 #, c-format
 msgid "%s deleted from %s access list."
 msgstr "%s %s kanalının access listesinden silindi."
 
-#: modules/core/cs_akick.cpp:331
+#: modules/core/cs_akick.cpp:330
 #, c-format
 msgid "%s deleted from %s autokick list."
 msgstr "%s %s kanalının akick listesinden silindi."
 
-#: modules/core/bs_badwords.cpp:211
+#: modules/core/bs_badwords.cpp:210
 #, c-format
 msgid "%s deleted from %s bad words list."
 msgstr "%s %s kanalının küfür listesinden çıkarıldı."
 
-#: modules/core/os_session.cpp:312
+#: modules/core/os_session.cpp:318
 #, c-format
 msgid "%s deleted from session-limit exception list."
 msgstr "%s session-limit exception listesinden silindi."
 
-#: modules/core/os_akill.cpp:275
+#: modules/core/os_akill.cpp:244
 #, c-format
 msgid "%s deleted from the AKILL list."
 msgstr "%s AKILL listesinden silindi."
 
-#: modules/core/os_snline.cpp:291
+#: modules/core/os_snline.cpp:259
 #, c-format
 msgid "%s deleted from the SNLINE list."
 msgstr "%s SNLINE listesinden silindi."
 
-#: modules/core/os_sqline.cpp:271
+#: modules/core/os_sqline.cpp:239
 #, c-format
 msgid "%s deleted from the SQLINE list."
 msgstr "%s SQLINE listesinden silindi."
 
-#: modules/core/os_szline.cpp:275
+#: modules/core/os_szline.cpp:243
 #, c-format
 msgid "%s deleted from the SZLINE list."
 msgstr "%s SZLINE listesinden silindi."
@@ -248,71 +239,79 @@ msgstr "%s SZLINE listesinden silindi."
 msgid "%s deleted from your access list."
 msgstr "%s access listenizden silindi."
 
-#: modules/core/cs_access.cpp:598
+#: modules/core/ns_cert.cpp:82
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list"
+msgstr "%s access listenizden silindi."
+
+#: modules/core/ns_cert.cpp:98
+#, fuzzy, c-format
+msgid "%s deleted from your certificate list."
+msgstr "%s access listenizden silindi."
+
+#: modules/core/cs_access.cpp:611
 #, c-format
 msgid "%s disabled on channel %s."
 msgstr "%s %s kanalında iptal edildi."
 
-#: modules/core/cs_invite.cpp:65
+#: modules/core/cs_invite.cpp:66
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
 
-#: modules/core/cs_unban.cpp:55
+#: modules/core/cs_unban.cpp:56
 #, c-format
 msgid "%s has been unbanned from %s."
 msgstr "%s has been unbanned from %s."
 
-#: modules/core/cs_set_founder.cpp:53
+#: modules/core/cs_set_founder.cpp:54
 #, c-format
 msgid "%s has too many channels registered."
 msgstr "%s çok fazla kanala sahip."
 
-#: src/operserv.cpp:512 src/operserv.cpp:580 src/operserv.cpp:690
-#: src/operserv.cpp:815
+#: modules/core/ms_help.cpp:34
+#, fuzzy, c-format
+msgid ""
+"%s is a utility allowing IRC users to send short\n"
+"messages to other IRC users, whether they are online at\n"
+"the time or not, or to channels(*). Both the sender's\n"
+"nickname and the target nickname or channel must be\n"
+"registered in order to send a memo.\n"
+"%s's commands include:"
+msgstr ""
+"%s kullanıcıların birbirlerine veya kanallara(*) online \n"
+"olmasalar bile mesaj göndermelerini sağlar. Mesaj gönderebilmek\n"
+"için gönderenin nicki, gönderilenin nicki veya kanalın kayıtlı\n"
+"olması gereklidir.\n"
+"\n"
+"%s'ün mevcut komutları:"
+
+#: src/operserv.cpp:504 src/operserv.cpp:574 src/operserv.cpp:686
+#: src/operserv.cpp:813
 #, c-format
 msgid "%s is already covered by %s."
 msgstr "%s zaten %s tarafından değiştirildi."
 
-#: modules/core/ms_ignore.cpp:57
+#: modules/core/ms_ignore.cpp:58
 #, fuzzy, c-format
 msgid "%s is already on your ignore list."
 msgstr "%s access listenize eklendi."
 
-#: modules/core/cs_set_bantype.cpp:34
+#: modules/core/cs_set_bantype.cpp:37
 #, c-format
 msgid "%s is not a valid ban type."
 msgstr "%s geçerli bir ban tipi değil."
 
-#: modules/core/bs_info.cpp:217
+#: modules/core/bs_info.cpp:218
 #, c-format
 msgid "%s is not a valid bot or registered channel."
 msgstr "%s geçerli bir bot yada kanal değil."
 
-#: include/language.h:35
-#, c-format
-msgid "%s is not a valid e-mail address."
-msgstr "%s geçerli bir mail adresi değil."
-
-#: include/language.h:23
-#, c-format
-msgid "%s is not currently on channel %s."
-msgstr "%s su anda %s kanalinda degil."
-
-#: modules/core/ms_ignore.cpp:69
+#: modules/core/ms_ignore.cpp:70
 #, fuzzy, c-format
 msgid "%s is not on your ignore list."
 msgstr "%s not found on ignore list."
 
-#: include/language.h:90
-#, c-format
-msgid ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-msgstr ""
-"%s matches an except on %s and cannot be banned until the except have been "
-"removed."
-
 #: modules/core/cs_xop.cpp:189
 #, fuzzy, c-format
 msgid "%s moved to %s %s list."
@@ -323,12 +322,12 @@ msgstr "%s moved to %s AOP list."
 msgid "%s not found on %s %s list."
 msgstr "%s %s kanali AOP listesinde bulunamadi."
 
-#: modules/core/cs_access.cpp:263
+#: modules/core/cs_access.cpp:269
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s %s kanalının access listesinde bulunamadı."
 
-#: modules/core/cs_akick.cpp:322
+#: modules/core/cs_akick.cpp:321
 #, c-format
 msgid "%s not found on %s autokick list."
 msgstr "%s %s kanalının akick listesinde bulunamadı."
@@ -338,32 +337,32 @@ msgstr "%s %s kanalının akick listesinde bulunamadı."
 msgid "%s not found on %s bad words list."
 msgstr "%s %s kanalının küfür listesinde bulunamadı."
 
-#: modules/core/os_session.cpp:155
+#: modules/core/os_session.cpp:160
 #, c-format
 msgid "%s not found on session list."
 msgstr "%s session listesinde bulunamadı."
 
-#: modules/core/os_session.cpp:316
+#: modules/core/os_session.cpp:322
 #, c-format
 msgid "%s not found on session-limit exception list."
 msgstr "%s session-limit exception listesinde bulunamadı."
 
-#: modules/core/os_akill.cpp:268
+#: modules/core/os_akill.cpp:237
 #, c-format
 msgid "%s not found on the AKILL list."
 msgstr "%s AKILL listesinde bulunamadı."
 
-#: modules/core/os_snline.cpp:284
+#: modules/core/os_snline.cpp:252
 #, c-format
 msgid "%s not found on the SNLINE list."
 msgstr "%s SNLINE listesinde bulunamadı."
 
-#: modules/core/os_sqline.cpp:264
+#: modules/core/os_sqline.cpp:232
 #, c-format
 msgid "%s not found on the SQLINE list."
 msgstr "%s SQLINE listesinde bulunamadi."
 
-#: modules/core/os_szline.cpp:268
+#: modules/core/os_szline.cpp:236
 #, c-format
 msgid "%s not found on the SZLINE list."
 msgstr "%s SZLINE listesinde bulunamadı."
@@ -373,12 +372,17 @@ msgstr "%s SZLINE listesinde bulunamadı."
 msgid "%s not found on your access list."
 msgstr "%s access listenizde bulunamadı."
 
-#: modules/core/ms_ignore.cpp:66
+#: modules/core/ns_cert.cpp:94
+#, fuzzy, c-format
+msgid "%s not found on your certificate list."
+msgstr "%s access listenizde bulunamadı."
+
+#: modules/core/ms_ignore.cpp:67
 #, fuzzy, c-format
 msgid "%s removed from your ignore list."
 msgstr "%s access listenizden silindi."
 
-#: modules/core/os_userlist.cpp:35
+#: modules/core/os_userlist.cpp:36
 #, c-format
 msgid ""
 "%s users list:\n"
@@ -402,16 +406,12 @@ msgstr "%s will now be ignored for %s."
 msgid "%s will now permanently be ignored."
 msgstr "%s will now permanently be ignored."
 
-#: modules/core/os_help.cpp:36
+#: modules/core/os_help.cpp:37
 #, c-format
 msgid "Notice: All commands sent to %s are logged!"
 msgstr "Not: %s'e gönderilen tüm komutların kaydı tutulur!"
 
-#: include/language.h:15
-msgid "Notice: Services is in read-only mode; changes will not be saved!"
-msgstr "Not: Servisler read-only modunda; değişiklikler kaydedilmeyecektir!"
-
-#: src/operserv.cpp:484
+#: src/operserv.cpp:476
 msgid ""
 "Reminder: AKILL masks cannot contain nicknames; make sure you have not "
 "included a nick portion in your mask."
@@ -419,11 +419,12 @@ msgstr ""
 "Hatırlatma: AKILL maskına nick eklenemez; AKILL maskına nick "
 "eklemediğinizden emin olun."
 
-#: src/operserv.cpp:795
+#: src/operserv.cpp:793
 msgid "Reminder: you can only add IP masks to the SZLINE list."
 msgstr "Hatırlatma: SZLINE listesine sadece IP masklarını ekleyebilirsiniz."
 
-#: modules/core/cs_access.cpp:500
+#: modules/core/cs_access.cpp:508
+#, fuzzy, c-format
 msgid ""
 "User access levels\n"
 " \n"
@@ -473,22 +474,22 @@ msgstr "[auto-memo] The memo you sent has been viewed."
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] The memo you sent to %s has been viewed."
 
-#: modules/core/ns_register.cpp:350
+#: modules/core/ns_register.cpp:256
 #, fuzzy
 msgid "password email"
 msgstr "REGISTER şifreniz emailiniz"
 
-#: modules/core/ns_register.cpp:352
+#: modules/core/ns_register.cpp:258
 #, fuzzy
 msgid "password [email]"
 msgstr "REGISTER şifreniz emailiniz"
 
-#: modules/core/ns_group.cpp:173
+#: modules/core/ns_group.cpp:178
 #, fuzzy
 msgid "target password"
 msgstr "GROUP hedef şifre"
 
-#: modules/core/ns_help.cpp:51
+#: modules/core/ns_help.cpp:54
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -505,7 +506,7 @@ msgstr ""
 "amaçlı değildir. %s 'ün kötüye Kullanımı kötüye \n"
 "kullanılan kişinin nickini kaybetmesiyle sonuçlanacaktır."
 
-#: modules/core/cs_help.cpp:50
+#: modules/core/cs_help.cpp:53
 msgid ""
 " \n"
 "Services Operators can also drop any channel without needing\n"
@@ -516,7 +517,8 @@ msgstr ""
 "Servis adminleri kanalın kaydını şifreyle tanıtmadan silebilir,\n"
 "ve access, Akick ve seviye ayarlarını görüntüleyebilirler."
 
-#: modules/core/ns_help.cpp:43
+#: modules/core/ns_help.cpp:45
+#, fuzzy, c-format
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -527,989 +529,343 @@ msgstr ""
 "kaydını silebilir(drop) ve herhangi bir nickin access listesini \n"
 "görüntüleyebilir. (/msg %s ACCESS LIST nick)."
 
-#: modules/core/bs_info.cpp:214
+#: modules/core/cs_xop.cpp:505
+#, c-format
+msgid ""
+" \n"
+"The AOP ADD and AOP DEL commands are limited to\n"
+"SOPs or above, while the AOP CLEAR command can only\n"
+"be used by the channel founder. However, any user on the\n"
+"AOP list may use the AOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:566
+#, c-format
+msgid ""
+" \n"
+"The HOP ADD, HOP DEL and HOP LIST commands are \n"
+"limited to AOPs or above, while the HOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:442
+#, c-format
+msgid ""
+" \n"
+"The QOP commands are limited to\n"
+"founders (unless SECUREOPS is off). However, any user on the\n"
+"QOP list may use the QOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:628
+#, c-format
+msgid ""
+" \n"
+"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
+"limited to the channel founder. However, any user on the\n"
+"AOP list may use the SOP LIST command.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/cs_xop.cpp:689
+#, c-format
+msgid ""
+" \n"
+"The VOP ADD, VOP DEL and VOP LIST commands are \n"
+"limited to AOPs or above, while the VOP CLEAR command \n"
+"can only be used by the channel founder.\n"
+" \n"
+"This command may have been disabled for your channel, and\n"
+"in that case you need to use the access list. See \n"
+"%s%s HELP ACCESS for information about the access list,\n"
+"and %s%s HELP SET XOP to know how to toggle between \n"
+"the access list and xOP list systems."
+msgstr ""
+
+#: modules/core/bs_info.cpp:215
 #, c-format
 msgid "            Options : %s"
 msgstr "         Özellikler : %s"
 
-#: modules/core/ns_info.cpp:115
+#: modules/core/ns_info.cpp:109
 #, c-format
 msgid "            vhost: %s"
 msgstr "                 vhost: %s"
 
-#: modules/core/ns_info.cpp:113
+#: modules/core/ns_info.cpp:107
 #, c-format
 msgid "            vhost: %s@%s"
 msgstr "            \tvhost: %s@%s"
 
-#: modules/core/bs_info.cpp:80
+#: modules/core/bs_info.cpp:81
 #, c-format
 msgid "           Bot nick : %s"
 msgstr "           Botun nicki : %s"
 
-#: modules/core/bs_info.cpp:82
+#: modules/core/bs_info.cpp:83
 msgid "           Bot nick : not assigned yet."
 msgstr "           Botun nicki : şu an yok."
 
-#: include/language.h:61
-#, c-format
-msgid "          Options: %s"
-msgstr "            Özellikler: %s"
-
-#: modules/core/bs_info.cpp:110
+#: modules/core/bs_info.cpp:111
 #, c-format
 msgid "        Caps kicker : %s"
 msgstr "     Büyük yazıda atma : %s"
 
-#: modules/core/bs_info.cpp:105
+#: modules/core/bs_info.cpp:106
 #, c-format
 msgid "        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"
 msgstr "     Büyük yazıda atma : %s (%d tanede ban; minimum %d/%d%%)"
 
-#: modules/core/bs_info.cpp:107
+#: modules/core/bs_info.cpp:108
 #, c-format
 msgid "        Caps kicker : %s (minimum %d/%d%%)"
 msgstr "     Büyük yazıda atma : %s (minimum %d/%d%%)"
 
-#: modules/core/cs_info.cpp:62
+#: modules/core/cs_info.cpp:63
 #, c-format
 msgid "        Founder: %s"
 msgstr "        Founder: %s"
 
-#: modules/core/cs_info.cpp:80
+#: modules/core/cs_info.cpp:81
 #, c-format
 msgid "       Ban type: %d"
 msgstr "       Ban tipi: %d"
 
-#: modules/core/bs_info.cpp:98 modules/core/bs_info.cpp:101
+#: modules/core/bs_info.cpp:99 modules/core/bs_info.cpp:102
 #, c-format
 msgid "       Bolds kicker : %s"
 msgstr "     Kalın yazıda atma : %s"
 
-#: modules/core/bs_info.cpp:96
+#: modules/core/bs_info.cpp:97
 #, c-format
 msgid "       Bolds kicker : %s (%d kick(s) to ban)"
 msgstr "     Kalın yazıda atma : %s (%d tanede ban)"
 
-#: modules/core/bs_info.cpp:128
+#: modules/core/bs_info.cpp:129
 #, c-format
 msgid "       Flood kicker : %s"
 msgstr "          Floodda atma : %s"
 
-#: modules/core/bs_info.cpp:123
+#: modules/core/bs_info.cpp:124
 #, c-format
 msgid "       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"
 msgstr "          Floodda atma : %s (%d tanede ban; %d sıra %ds)"
 
-#: modules/core/bs_info.cpp:125
+#: modules/core/bs_info.cpp:126
 #, c-format
 msgid "       Flood kicker : %s (%d lines in %ds)"
 msgstr "          Floodda atma : %s (%d sıra %ds)"
 
-#: modules/core/bs_info.cpp:61
+#: modules/core/bs_info.cpp:62
 #, c-format
 msgid "       Mask : %s@%s"
 msgstr "               Mask : %s@%s"
 
-#: modules/core/bs_info.cpp:116 modules/core/bs_info.cpp:119
+#: modules/core/bs_info.cpp:117 modules/core/bs_info.cpp:120
 #, c-format
 msgid "      Colors kicker : %s"
 msgstr "    Renkli yazıda atma : %s"
 
-#: modules/core/bs_info.cpp:114
+#: modules/core/bs_info.cpp:115
 #, c-format
 msgid "      Colors kicker : %s (%d kick(s) to ban)"
 msgstr "    Renkli yazıda atma : %s (%d tanede ban)"
 
-#: modules/core/cs_info.cpp:106
+#: modules/core/cs_info.cpp:105
 #, c-format
 msgid "      Expires on: %s"
 msgstr "      Expires in: %s"
 
-#: modules/core/bs_info.cpp:176 modules/core/bs_info.cpp:178
-#: modules/core/bs_info.cpp:180
+#: modules/core/bs_info.cpp:177 modules/core/bs_info.cpp:179
+#: modules/core/bs_info.cpp:181
 #, fuzzy, c-format
 msgid "      Fantasy reply : %s"
 msgstr "       Ban tipi: %d"
 
-#: modules/core/cs_info.cpp:69
+#: modules/core/cs_info.cpp:70
 #, c-format
 msgid "      Last used: %s"
 msgstr " Son kullanılış: %s"
 
-#: modules/core/cs_info.cpp:100
+#: modules/core/cs_info.cpp:102
 #, c-format
 msgid "      Mode lock: %s"
 msgstr "     Mod kilidi: %s"
 
-#: modules/core/bs_info.cpp:137
+#: modules/core/bs_info.cpp:138
 #, c-format
 msgid "      Repeat kicker : %s"
 msgstr "         Tekrarda atma : %s"
 
-#: modules/core/bs_info.cpp:132
+#: modules/core/bs_info.cpp:133
 #, c-format
 msgid "      Repeat kicker : %s (%d kick(s) to ban; %d times)"
 msgstr "         Tekrarda atma : %s (%d tanede ban; %d kez)"
 
-#: modules/core/bs_info.cpp:134
+#: modules/core/bs_info.cpp:135
 #, c-format
 msgid "      Repeat kicker : %s (%d times)"
 msgstr "         Tekrarda atma : %s (%d kez)"
 
-#: modules/core/cs_info.cpp:65
+#: modules/core/cs_info.cpp:66
 #, c-format
 msgid "      Successor: %s"
 msgstr "      Successor: %s"
 
-#: modules/core/cs_info.cpp:109
+#: modules/core/cs_info.cpp:108
 #, c-format
 msgid "      Suspended: [%s] %s"
 msgstr "      Suspended: [%s] %s"
 
-#: modules/core/bs_info.cpp:170 modules/core/bs_info.cpp:173
+#: modules/core/bs_info.cpp:171 modules/core/bs_info.cpp:174
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s"
 msgstr "     Büyük yazıda atma : %s"
 
-#: modules/core/bs_info.cpp:168
+#: modules/core/bs_info.cpp:169
 #, fuzzy, c-format
 msgid "     AMSG kicker    : %s (%d kick(s) to ban)"
 msgstr "     Kalın yazıda atma : %s (%d tanede ban)"
 
-#: modules/core/bs_info.cpp:161 modules/core/bs_info.cpp:164
+#: modules/core/bs_info.cpp:162 modules/core/bs_info.cpp:165
 #, c-format
 msgid "     Italics kicker : %s"
 msgstr "        Italics kicker : %s"
 
-#: modules/core/bs_info.cpp:159
+#: modules/core/bs_info.cpp:160
 #, c-format
 msgid "     Italics kicker : %s (%d kick(s) to ban)"
 msgstr "        Italics kicker : %s (%d kick(s) to ban)"
 
-#: modules/core/cs_info.cpp:74
+#: modules/core/cs_info.cpp:75
 #, c-format
 msgid "     Last topic: %s"
 msgstr "      Son topic: %s"
 
-#: modules/core/cs_info.cpp:68
+#: modules/core/cs_info.cpp:69
 #, c-format
 msgid "     Registered: %s"
 msgstr "   Kayıt tarihi: %s"
 
-#: modules/core/cs_access.cpp:635
+#: modules/core/cs_access.cpp:648
 #, c-format
 msgid "    %-*s  %d"
 msgstr "    %-*s  %d"
 
-#: modules/core/cs_access.cpp:709
+#: modules/core/cs_access.cpp:723
 #, c-format
 msgid "    %-*s  %s"
 msgstr "    %-*s  %s"
 
-#: modules/core/cs_access.cpp:630
+#: modules/core/cs_access.cpp:643
 #, c-format
 msgid "    %-*s  (disabled)"
 msgstr "    %-*s  (kapatıldı)"
 
-#: modules/core/cs_access.cpp:633
+#: modules/core/cs_access.cpp:646
 #, c-format
 msgid "    %-*s  (founder only)"
 msgstr "    %-*s  (sadece founder)"
 
-#: modules/core/ns_access.cpp:185
-msgid "    ACCESS     Modify the list of authorized addresses"
-msgstr "    ACCESS     İzinli adreslerin listesini düzenler"
-
-#: modules/core/cs_access.cpp:746
-msgid "    ACCESS     Modify the list of privileged users"
-msgstr "    ACCESS     Ayrıcalıklı kullanıcıları belirler değiştirir"
-
-#: modules/core/bs_act.cpp:76
-msgid "    ACT            Makes the bot do the equivalent of a \"/me\" command"
-msgstr ""
-"ACT                Makes the bot do the equivalent of a \"/me\" command"
-
-#: modules/core/ns_ajoin.cpp:110
-#, fuzzy
-msgid "    AJOIN      Manage your auto join list"
-msgstr "    AKICK      Autokick listesini düzenler"
-
-#: modules/core/cs_akick.cpp:564
-msgid "    AKICK      Maintain the AutoKick list"
-msgstr "    AKICK      Autokick listesini düzenler"
-
-#: modules/core/os_akill.cpp:459
-msgid "    AKILL       Manipulate the AKILL list"
-msgstr "    AKILL       AKILL listesini düzenler"
-
-#: modules/core/ns_alist.cpp:162
-msgid "    ALIST      List channels you have access on"
-msgstr "    ALIST      List channels you have access on"
-
-#: modules/core/cs_xop.cpp:530
-msgid "    AOP        Modify the list of AOP users"
-msgstr "    AOP        AOP listesini düzenler"
-
-#: modules/core/bs_assign.cpp:86
-msgid "    ASSIGN         Assigns a bot to a channel"
-msgstr "ASSIGN             Kanala bot sokar"
-
-#: modules/core/ns_set_autoop.cpp:64
-msgid "    AUTOOP     Should services op you automatically.    "
-msgstr "    AUTOOP     Should services op you automatically.    "
-
-#: modules/core/ns_set_autoop.cpp:92
-msgid "    AUTOOP     Turn autoop on or off"
-msgstr "    AUTOOP     Turn autoop on or off"
-
-#: modules/core/bs_badwords.cpp:317
-msgid "    BADWORDS       Maintains bad words list"
-msgstr "BADWORDS           Küfür listesi oluşturur"
-
-#: modules/core/cs_ban.cpp:95
-msgid "    BAN        Bans a selected nick on a channel"
-msgstr "    BAN        Bans a selected nick on a channel"
-
-#: modules/core/cs_set_bantype.cpp:68
-msgid "    BANTYPE       Set how Services make bans on the channel"
-msgstr "    BANTYPE       Servislerin kanalda ne tip ban koyacağını belirler"
-
-#: modules/core/bs_bot.cpp:416
-msgid "    BOT            Maintains network bot list"
-msgstr "BOT                Networkün bot listesini düzenler"
-
-#: modules/core/bs_botlist.cpp:76
-msgid "    BOTLIST        Lists available bots"
-msgstr "BOTLIST            Mevcut botları listeler"
-
-#: modules/core/ms_cancel.cpp:73
-msgid "    CANCEL Cancel last memo you sent"
-msgstr "    CANCEL Son gönderilen mesajı iptal eder"
-
-#: modules/core/os_chankill.cpp:104
-msgid "    CHANKILL    AKILL all users on a specific channel"
-msgstr "    CHANKILL    AKILL all users on a specific channel"
-
-#: modules/core/os_chanlist.cpp:92
-msgid "    CHANLIST    Lists all channel records"
-msgstr "    CHANLIST    Tüm kanal kayıtlarını listeler"
-
-#: modules/core/ms_check.cpp:85
-msgid "    CHECK  Checks if last memo to a nick was read"
-msgstr "    CHECK  Checks if last memo to a nick was read"
-
-#: modules/core/cs_clearusers.cpp:70
-#, fuzzy
-msgid "    CLEARUSERS Tells ChanServ to clear (kick) all users on a channel"
-msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
-
-#: modules/core/cs_clone.cpp:170
-#, fuzzy
-msgid "    CLONE      Copy all settings from one channel to another"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_register.cpp:172
-msgid "    CONFIRM    Confirm a nickserv auth code"
-msgstr "    CONFIRM    Confirm a nickserv auth code"
-
-#: modules/core/bs_info.cpp:63
+#: modules/core/bs_info.cpp:64
 #, c-format
 msgid "    Created : %s"
 msgstr "          Yaratılış : %s"
 
-#: modules/core/os_defcon.cpp:132
-msgid "    DEFCON      Manipulate the DefCon system"
-msgstr "    DEFCON      Manipulate the DefCon system"
-
-#: modules/core/cs_modes.cpp:321
-msgid "    DEHALFOP   Dehalfops a selected nick on a channel"
-msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
-
-#: modules/core/hs_del.cpp:61
-msgid "    DEL         Delete the vhost of another user"
-msgstr "    DEL         Delete the vhost of another user"
-
-#: modules/core/ms_del.cpp:153
-msgid "    DEL    Delete a memo or memos"
-msgstr "    DEL    Mesajları silmenizi sağlar"
-
-#: modules/core/hs_delall.cpp:66
-msgid "    DELALL      Delete the vhost for all nicks in a group"
-msgstr "    DELALL      Delete the vhost for all nicks in a group"
-
-#: modules/core/cs_modes.cpp:160
-msgid "    DEOP       Deops a selected nick on a channel"
-msgstr "    DEOP       Deops a selected nick on a channel"
-
-#: modules/core/cs_modes.cpp:482
-msgid "    DEOWNER    Removes your owner status on a channel"
-msgstr "    DEOWNER    Removes your owner status on a channel"
-
-#: modules/core/cs_modes.cpp:402
-msgid "    DEPROTECT  Deprotects a selected nick on a channel"
-msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
-
-#: modules/core/cs_set_description.cpp:53
-msgid "    DESC          Set the channel description"
-msgstr "    DESC          Kanal açıklamasını belirler"
-
-#: modules/core/cs_modes.cpp:238
-msgid "    DEVOICE    Devoices a selected nick on a channel"
-msgstr "    DEVOICE    Devoices a selected nick on a channel"
-
-#: modules/core/ns_saset.cpp:174
-msgid "    DISPLAY    Set the display of the group in Services"
-msgstr "    DISPLAY    Set the display of the group in Services"
-
-#: modules/core/ns_set.cpp:168
-msgid "    DISPLAY    Set the display of your group in Services"
-msgstr "    DISPLAY    Grubunuzun servislerde nasıl görüneceğini ayarlar"
-
-#: modules/core/cs_drop.cpp:105
-msgid "    DROP       Cancel the registration of a channel"
-msgstr "    DROP       Kanal kaydını siler"
-
-#: modules/core/ns_drop.cpp:152
-msgid "    DROP       Cancel the registration of a nickname"
-msgstr "    DROP       Nickin kaydını siler"
-
-#: modules/core/cs_info.cpp:67
+#: modules/core/cs_info.cpp:68
 #, c-format
 msgid "    Description: %s"
 msgstr "       Açıklama: %s"
 
-#: modules/core/ns_set_email.cpp:96
-msgid "    EMAIL      Associate an E-mail address with the nickname"
-msgstr "    EMAIL      Associate an E-mail address with the nickname"
-
-#: modules/core/ns_set_email.cpp:75
-msgid "    EMAIL      Associate an E-mail address with your nickname"
-msgstr "    EMAIL      Nickinizle bir email adresini ilişkilendirir"
-
-#: modules/core/os_session.cpp:503
-msgid "    EXCEPTION   Modify the session-limit exception list"
-msgstr "    EXCEPTION   Session-limit exception listesini düzenler"
-
-#: modules/core/cs_forbid.cpp:116
-msgid "    FORBID     Prevent a channel from being used"
-msgstr "    FORBID     Kanalı kullanıma kapatır"
-
-#: modules/core/ns_forbid.cpp:105
-msgid "    FORBID     Prevents a nickname from being registered"
-msgstr "    FORBID     Bir nickin kullanılmasını yasaklar"
-
-#: modules/core/cs_set_founder.cpp:89
-msgid "    FOUNDER       Set the founder of a channel"
-msgstr "    FOUNDER       Kanal founderını belirler"
-
-#: modules/core/ns_getemail.cpp:72
-msgid ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-msgstr ""
-"    GETEMAIL   Matches and returns all users that registered using given "
-"email"
-
-#: modules/core/cs_getkey.cpp:65
-msgid "    GETKEY     Returns the key of the given channel"
-msgstr "    GETKEY     Returns the key of the given channel"
-
-#: modules/core/ns_getpass.cpp:80
-msgid "    GETPASS    Retrieve the password for a nickname"
-msgstr ""
-"    GETPASS    Bir nickin şifresini öğrenmek içindir\n"
-"               (Sadece şifreleme(encryption) devre dışıysa)"
-
-#: modules/core/ns_ghost.cpp:96
-msgid "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
-
-#: modules/core/ns_group.cpp:305
-msgid "    GLIST      Lists all nicknames in your group"
-msgstr "    GLIST      Lists all nicknames in your group"
-
-#: modules/core/os_global.cpp:50
-msgid "    GLOBAL      Send a message to all users"
-msgstr "    GLOBAL      Tüm kullanıcılara mesaj gönderir"
-
-#: modules/core/ns_set_greet.cpp:83
-msgid "    GREET      Associate a greet message with the nickname"
-msgstr "    GREET      Associate a greet message with the nickname"
-
-#: modules/core/ns_set_greet.cpp:59
-msgid "    GREET      Associate a greet message with your nickname"
-msgstr "    GREET      Nickiniz için bir karşılama mesajı belirler"
-
-#: modules/core/hs_group.cpp:53
-msgid "    GROUP       Syncs the vhost for all nicks in a group"
-msgstr "    GROUP       Syncs the vhost for all nicks in a group"
-
-#: modules/core/ns_group.cpp:178
-msgid "    GROUP      Join a group"
-msgstr "    GROUP      Bir gruba dahil eder"
-
-#: modules/core/ns_info.cpp:118
+#: modules/core/ns_info.cpp:112
 #, c-format
 msgid "    Greet message: %s"
 msgstr "      Karşılama mesajı: %s"
 
-#: modules/core/cs_modes.cpp:279
-msgid "    HALFOP     Halfops a selected nick on a channel"
-msgstr "    HALFOP     Halfops a selected nick on a channel"
-
-#: modules/core/ns_set_hide.cpp:103 modules/core/ns_set_hide.cpp:135
-msgid "    HIDE       Hide certain pieces of nickname information"
-msgstr "    HIDE       Nickinizle ilgili bazı bilgileri saklar"
-
-#: modules/core/cs_xop.cpp:594
-msgid "    HOP        Maintains the HOP (HalfOP) list for a channel"
-msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
-
-#: modules/core/ns_identify.cpp:124
-msgid "    IDENTIFY   Identify yourself with your password"
-msgstr "    IDENTIFY   Şifrenizle nickinizi tanıtır"
-
-#: modules/core/os_ignore.cpp:284
-msgid "    IGNORE      Modify the Services ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/ms_ignore.cpp:104
-#, fuzzy
-msgid "    IGNORE Manage your memo ignore list"
-msgstr "    IGNORE      Modify the Services ignore list"
-
-#: modules/core/bs_info.cpp:240
-msgid ""
-"    INFO           Allows you to see BotServ information about a channel or "
-"a bot"
-msgstr ""
-"INFO               Allows you to see BotServ information about a channel or "
-"a bot"
-
-#: modules/core/ns_info.cpp:167
-msgid "    INFO       Displays information about a given nickname"
-msgstr "    INFO       Displays information about a given nickname"
-
-#: modules/core/cs_info.cpp:135
-msgid "    INFO       Lists information about the named registered channel"
-msgstr "    INFO       Lists information about the named registered channel"
-
-#: modules/core/ms_info.cpp:217
-msgid "    INFO   Displays information about your memos"
-msgstr "    INFO   Displays information about your memos"
-
-#: modules/core/cs_invite.cpp:89
-msgid "    INVITE     Tells ChanServ to invite you into a channel"
-msgstr "    INVITE     Tells ChanServ to invite you into a channel"
-
-#: modules/core/os_jupe.cpp:70
-msgid "    JUPE        \"Jupiter\" a server"
-msgstr "    JUPE        Bir server'ı \"Kullanılmaz\" yapar"
-
-#: modules/core/cs_set_keeptopic.cpp:64
-msgid "    KEEPTOPIC     Retain topic when channel is not in use"
-msgstr "    KEEPTOPIC     Kanalda kimse olmasa bile topiği hatırlar"
-
-#: modules/core/bs_kick.cpp:534
-msgid "    KICK           Configures kickers"
-msgstr "KICK               Atma özelliklerini ayarlar"
-
-#: modules/core/os_kick.cpp:74
-msgid "    KICK        Kick a user from a channel"
-msgstr "    KICK        Bir kullanıcıyı kanaldan atar"
-
-#: modules/core/cs_kick.cpp:81
-msgid "    KICK       Kicks a selected nick from a channel"
-msgstr "    KICK       Kicks a selected nick from a channel"
-
-#: modules/core/ns_set_kill.cpp:98 modules/core/ns_set_kill.cpp:135
-msgid "    KILL       Turn protection on or off"
-msgstr "    KILL       Korumayı açar kapatır"
-
-#: modules/core/ns_set_language.cpp:81
-msgid ""
-"    LANGUAGE   Set the language Services will use when\n"
-"                   sending messages to you"
-msgstr ""
-"    LANGUAGE   Servislerin size hitap edeceği \n"
-"                  dili belirler"
-
-#: modules/core/cs_access.cpp:747
-msgid "    LEVELS     Redefine the meanings of access levels"
-msgstr "    LEVELS     Access seviyelerini isteğinize göre düzenler"
-
-#: modules/core/hs_list.cpp:117
-msgid "    LIST        Displays one or more vhost entries."
-msgstr "    LIST        Displays one or more vhost entries."
-
-#: modules/core/ns_list.cpp:236
-msgid "    LIST       List all registered nicknames that match a given pattern"
-msgstr ""
-"    LIST       List all registered nicknames that match a given pattern"
-
-#: modules/core/cs_list.cpp:142
-msgid "    LIST       Lists all registered channels matching the given pattern"
-msgstr ""
-"    LIST       Lists all registered channels matching the given pattern"
-
-#: modules/core/ms_list.cpp:165
-msgid "    LIST   List your memos"
-msgstr "    LIST   Mesajlarınızı listeler"
-
-#: modules/core/os_news.cpp:324
-msgid "    LOGONNEWS   Define messages to be shown to users at logon"
-msgstr ""
-"    LOGONNEWS   Bağlantı sırasında kullanıcının göreceği mesajı \n"
-"                belirler"
-
-#: modules/core/ns_logout.cpp:95
-msgid "    LOGOUT     Reverses the effect of the IDENTIFY command"
-msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
-
-#: modules/core/cs_akick.cpp:124
+#: modules/core/cs_akick.cpp:123
 #, c-format
 msgid "    Last used %s"
 msgstr "    Last used %s"
 
-#: modules/core/os_mode.cpp:61
-msgid "    MODE        Change a channel's modes"
-msgstr "    MODE        Bir kanalın modlarını değiştirir"
-
-#: modules/core/cs_mode.cpp:312
-#, fuzzy
-msgid "    MODE       Control modes and mode locks on a channel"
-msgstr "    CLEARMODES  Bir kanalın modlarını temizler"
-
-#: modules/core/os_modinfo.cpp:82
-msgid "    MODINFO     Info about a loaded module"
-msgstr "    MODINFO     Info about a loaded module"
-
-#: modules/core/os_modlist.cpp:218
-msgid "    MODLIST     List loaded modules"
-msgstr "    MODLIST     List loaded modules"
-
-#: modules/core/os_modload.cpp:70
-msgid "    MODLOAD     Load a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modreload.cpp:96
-#, fuzzy
-msgid "    MODRELOAD   Reload a module"
-msgstr "    MODLOAD     Load a module"
-
-#: modules/core/os_modunload.cpp:78
-msgid "    MODUNLOAD   Un-Load a module"
-msgstr "    MODUNLOAD   Un-Load a module"
-
-#: modules/core/ns_set_message.cpp:71 modules/core/ns_set_message.cpp:99
-msgid "    MSG        Change the communication method of Services"
-msgstr "    MSG        Change the communication method of Services"
-
-#: modules/core/cs_saset_noexpire.cpp:61
-msgid "    NOEXPIRE      Prevent the channel from expiring"
-msgstr "    NOEXPIRE      Prevent the channel from expiring"
-
-#: modules/core/ns_saset_noexpire.cpp:63
-msgid "    NOEXPIRE   Prevent the nickname from expiring"
-msgstr "    NOEXPIRE   Prevent the nickname from expiring"
-
-#: modules/core/os_noop.cpp:85
-msgid ""
-"    NOOP        Temporarily remove all O:lines of a server \n"
-"                remotely"
-msgstr "    NOOP        Geçici olarak tüm O:line ları kaldırır"
-
-#: modules/core/hs_off.cpp:51
-msgid "    OFF         Deactivates your assigned vhost"
-msgstr "    OFF         Deactivates your assigned vhost"
-
-#: modules/core/os_oline.cpp:70
-msgid "    OLINE       Give Operflags to a certain user"
-msgstr "    OLINE       Give Operflags to a certain user"
-
-#: modules/core/hs_on.cpp:61
-msgid "    ON          Activates your assigned vhost"
-msgstr "    ON          Activates your assigned vhost"
-
-#: modules/core/cs_modes.cpp:122
-msgid "    OP         Gives Op status to a selected nick on a channel"
-msgstr "    OP         Gives Op status to a selected nick on a channel"
-
-#: modules/core/os_news.cpp:364
-msgid "    OPERNEWS    Define messages to be shown to users who oper"
-msgstr ""
-"    OPERNEWS    Oper olan kullanıcıların görüntüleyeceği mesajı \n"
-"                belirler"
-
-#: modules/core/cs_set_opnotice.cpp:63
-msgid "    OPNOTICE      Send a notice when OP/DEOP commands are used"
-msgstr "    OPNOTICE      OP/DEOP komutları kullanıldığında mesaj yollar"
-
-#: modules/core/cs_modes.cpp:442
-msgid "    OWNER      Gives you owner status on channel"
-msgstr "    OWNER      Gives you owner status on channel"
-
-#: modules/core/bs_info.cpp:64
+#: modules/core/bs_info.cpp:65
 #, c-format
 msgid "    Options : %s"
 msgstr "    Ayarlar : %s"
 
-#: modules/core/ns_saset.cpp:245
-msgid "    PASSWORD   Set the nickname password"
-msgstr "    PASSWORD   Set the nickname password"
-
-#: modules/core/ns_set.cpp:230
-msgid "    PASSWORD   Set your nickname password"
-msgstr "    PASSWORD   Nickinize şifre belirtir"
-
-#: modules/core/cs_set_peace.cpp:63
-msgid "    PEACE         Regulate the use of critical commands"
-msgstr "    PEACE         kritik komutlarin kullanilmasini engeller"
-
-#: modules/core/cs_set_persist.cpp:135
-msgid "    PERSIST       Set the channel as permanent"
-msgstr "    PERSIST       Set the channel as permanent"
-
-#: modules/core/cs_set_private.cpp:62
-msgid "    PRIVATE       Hide channel from LIST command"
-msgstr "    PRIVATE       LIST komutuyla kanal listelenmez"
-
-#: modules/core/ns_set_private.cpp:67
-#, fuzzy
-msgid "    PRIVATE    Prevent the nickname from appearing in a %s%s LIST"
-msgstr ""
-"    PRIVATE    Prevent the nickname from appearing in a\n"
-"                   /msg %s LIST"
-
-#: modules/core/cs_modes.cpp:362
-msgid "    PROTECT    Protects a selected nick on a channel"
-msgstr "    PROTECT    Protects a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:463
-msgid "    QOP        Modify the list of QOP users"
-msgstr "    QOP        Modify the list of QOP users"
-
-#: modules/core/os_quit.cpp:49
-msgid "    QUIT        Terminate the Services program with no save"
-msgstr "    QUIT        Servis programını kapatır"
-
-#: modules/core/os_news.cpp:401
-msgid ""
-"    RANDOMNEWS  Define messages to be randomly shown to users \n"
-"                at logon"
-msgstr ""
-"    RANDOMNEWS  Baglanti sirasina kullaniciya gönderilen karisik\n"
-"                mesajlari belirler"
-
-#: modules/core/ms_read.cpp:150
-msgid "    READ   Read a memo or memos"
-msgstr "    READ   Mesajları okumanızı sağlar"
-
-#: modules/core/ns_recover.cpp:124
-msgid "    RECOVER    Kill another user who has taken your nick"
-msgstr "    RECOVER    Nickinizi kullanan birini kill ler"
-
-#: modules/core/cs_register.cpp:131
-#, fuzzy
-msgid "    REGISTER   Register a channel"
-msgstr "    REGISTER   Nickinizi kaydeder"
-
-#: modules/core/ns_register.cpp:357
-msgid "    REGISTER   Register a nickname"
-msgstr "    REGISTER   Nickinizi kaydeder"
-
-#: modules/core/ns_release.cpp:101
-msgid "    RELEASE    Regain custody of your nick after RECOVER"
-msgstr ""
-"    RELEASE    RECOVER komutundan sonra nickinizi serbest \n"
-"               bırakır"
-
-#: modules/core/os_reload.cpp:53
-msgid "    RELOAD      Reload services' configuration file"
-msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
-
-#: modules/core/ns_register.cpp:409
-msgid "    RESEND     Resend a nickserv auth code"
-msgstr "    RESEND     Resend a nickserv auth code"
-
-#: modules/core/ns_resetpass.cpp:64
-msgid "    RESETPASS  Helps you reset lost passwords"
-msgstr "    RESETPASS  Helps you reset lost passwords"
-
-#: modules/core/os_restart.cpp:46
-msgid "    RESTART     Save databases and restart Services"
-msgstr ""
-"    RESTART     Veritabanını kaydeder ve servisleri yeniden \n"
-"                başlatır"
-
-#: modules/core/cs_set_restricted.cpp:65
-msgid "    RESTRICTED    Restrict access to the channel"
-msgstr "    RESTRICTED    Kanala izinli giriş gerektirir"
-
-#: modules/core/ms_rsend.cpp:80
-msgid "    RSEND  Sends a memo and requests a read receipt"
-msgstr "    RSEND  Sends a memo and requests a read receipt"
-
-#: modules/core/bs_info.cpp:143 modules/core/bs_info.cpp:146
+#: modules/core/bs_info.cpp:144 modules/core/bs_info.cpp:147
 #, c-format
 msgid "    Reverses kicker : %s"
 msgstr "        Ctrl+R de atma : %s"
 
-#: modules/core/bs_info.cpp:141
+#: modules/core/bs_info.cpp:142
 #, c-format
 msgid "    Reverses kicker : %s (%d kick(s) to ban)"
 msgstr "        Ctrl+R de atma : %s (%d tanede ban)"
 
-#: modules/core/cs_saset.cpp:102
-msgid "    SASET      Forcefully set channel options and information"
-msgstr "    SASET      Forcefully set channel options and information"
-
-#: modules/core/ns_saset.cpp:105
-msgid "    SASET      Set SET-options on another nickname"
-msgstr "    SASET      Set SET-options on another nickname"
-
-#: modules/core/bs_say.cpp:78
-msgid ""
-"    SAY            Makes the bot say the given text on the given channel"
-msgstr ""
-"SAY                Makes the bot say the given text on the given channel"
-
-#: modules/core/cs_set_secure.cpp:64
-#, c-format
-msgid "    SECURE        Activate %s security features"
-msgstr "    SECURE        %s güvenlik özelliklerini aktifleştirir"
-
-#: modules/core/ns_set_secure.cpp:69 modules/core/ns_set_secure.cpp:101
-msgid "    SECURE     Turn nickname security on or off"
-msgstr "    SECURE     Nick güvenliğini açar kapatır"
-
-#: modules/core/cs_set_securefounder.cpp:71
-msgid "    SECUREFOUNDER Stricter control of channel founder status"
-msgstr "    SECUREFOUNDER Kanal founderı durumunun sıkı kontrolünü sağlar"
-
-#: modules/core/cs_set_secureops.cpp:62
-msgid "    SECUREOPS     Stricter control of chanop status"
-msgstr "    SECUREOPS     Kanal opu durumunun sıkı kontrolünü sağlar"
-
-#: modules/core/ms_send.cpp:49
-msgid "    SEND   Send a memo to a nick or channel"
-msgstr "    SEND   Nicke veya kanala mesaj gönderir"
-
-#: modules/core/ms_sendall.cpp:62
-msgid "    SENDALL  Send a memo to all registered users"
-msgstr "    SENDALL  Send a memo to all registered users"
-
-#: modules/core/ns_sendpass.cpp:75
-msgid "    SENDPASS   Forgot your password? Try this"
-msgstr "    SENDPASS   Şifrenizimi unuttunuz? Bunu deneyin"
-
-#: modules/core/os_session.cpp:215
-msgid "    SESSION     View the list of host sessions"
-msgstr "    SESSION     Host session(oturum) ların listesini gösterir"
-
-#: modules/core/bs_set.cpp:301
-msgid "    SET            Configures bot options"
-msgstr "SET                Bot özelliklerini ayarlar"
-
-#: modules/core/hs_set.cpp:115
-msgid "    SET         Set the vhost of another user"
-msgstr "    SET         Set the vhost of another user"
-
-#: modules/core/os_set.cpp:243
-msgid "    SET         Set various global Services options"
-msgstr "    SET         Çeşitli global servis özelliklerini ayarlar"
-
-#: modules/core/cs_set.cpp:106
-msgid "    SET        Set channel options and information"
-msgstr "    SET        Kanal özelliklerini ve bilgisini ayarlar"
-
-#: modules/core/ns_set.cpp:102
-msgid "    SET        Set options, including kill protection"
-msgstr "    SET        Ayarlar, kill korumasını içerir"
-
-#: modules/core/ms_set.cpp:302
-msgid "    SET    Set options related to memos"
-msgstr "    SET    Mesajlarla ilgili ayarları yapar"
-
-#: modules/core/hs_setall.cpp:122
-msgid "    SETALL      Set the vhost for all nicks in a group"
-msgstr "    SETALL      Set the vhost for all nicks in a group"
-
-#: modules/core/os_shutdown.cpp:44
-msgid "    SHUTDOWN    Terminate the Services program with save"
-msgstr "    SHUTDOWN    Servisler programını kayıt ederek kapatır"
-
-#: modules/core/cs_set_signkick.cpp:76
-msgid "    SIGNKICK      Sign kicks that are done with KICK command"
-msgstr "    SIGNKICK      KICK komutuyla yapılan atmaları işaretler"
-
-#: modules/core/os_snline.cpp:475
-msgid "    SNLINE      Manipulate the SNLINE list"
-msgstr "    SNLINE      SNLINE listesini düzenler"
-
-#: modules/core/cs_xop.cpp:659
-msgid "    SOP        Modify the list of SOP users"
-msgstr "    SOP        SOP listesini düzenler"
-
-#: modules/core/os_sqline.cpp:455
-msgid "    SQLINE      Manipulate the SQLINE list"
-msgstr "    SQLINE      SQLINE listesini düzenler"
-
-#: modules/core/os_staff.cpp:63
-msgid "    STAFF       Display Services staff and online status"
-msgstr "    STAFF       Display Services staff and online status"
-
-#: modules/core/ms_staff.cpp:60
-msgid "    STAFF  Send a memo to all opers/admins"
-msgstr "    STAFF      Send a memo to all opers/admins"
-
-#: modules/core/os_stats.cpp:289
-msgid "    STATS       Show status of Services and network"
-msgstr "    STATS       Servislerin ve networkun durumunu gösterir"
-
-#: modules/core/cs_status.cpp:59
-#, fuzzy
-msgid ""
-"    STATUS     Returns the current access level of a user               on a "
-"channel"
-msgstr "    STATUS     Kullanıcının kanaldaki access seviyesini söyler"
-
-#: modules/core/ns_status.cpp:79
-msgid "    STATUS     Returns the owner status of the given nickname"
-msgstr "    STATUS     Returns the owner status of the given nickname"
-
-#: modules/core/cs_set_successor.cpp:96
-msgid "    SUCCESSOR     Set the successor for a channel"
-msgstr "    SUCCESSOR     Kanal successorını belirler"
-
-#: modules/core/cs_suspend.cpp:96
-#, fuzzy
-msgid ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               \tchannel data and settings"
-msgstr ""
-"    SUSPEND    Prevent a channel from being used preserving\n"
-"               channel data and settings"
-
-#: modules/core/ns_suspend.cpp:103
-msgid "    SUSPEND    Suspend a given nick"
-msgstr "    SUSPEND    Suspend a given nick"
-
-#: modules/core/os_svsnick.cpp:83
-msgid "    SVSNICK     Forcefully change a user's nickname"
-msgstr "    SVSNICK     Forcefully change a user's nickname"
-
-#: modules/core/os_szline.cpp:455
-msgid "    SZLINE      Manipulate the SZLINE list"
-msgstr "    SZLINE      SZLINE listesini düzenler"
-
-#: modules/core/cs_topic.cpp:71
-msgid "    TOPIC      Manipulate the topic of the specified channel"
-msgstr "    TOPIC      Manipulate the topic of the specified channel"
-
-#: modules/core/cs_set_topiclock.cpp:63
-msgid "    TOPICLOCK     Topic can only be changed with TOPIC"
-msgstr "    TOPICLOCK     Topic sadece SET TOPIC komutuyla değiştirilir"
-
-#: modules/core/os_umode.cpp:72
-msgid "    UMODE       Change a user's modes"
-msgstr "    UMODE       Change a user's modes"
-
-#: modules/core/bs_unassign.cpp:68
-msgid "    UNASSIGN       Unassigns a bot from a channel"
-msgstr "UNASSIGN           Unassigns a bot from a channel"
-
-#: modules/core/cs_unban.cpp:79
-msgid ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-msgstr ""
-"    UNBAN      Remove all bans preventing a user from entering a channel"
-
-#: modules/core/ns_group.cpp:247
-msgid "    UNGROUP    Remove a nick from a group"
-msgstr "    UNGROUP    Remove a nick from a group"
-
-#: modules/core/cs_suspend.cpp:157
-msgid "    UNSUSPEND  Releases a suspended channel"
-msgstr "    UNSUSPEND  Releases a suspended channel"
-
-#: modules/core/ns_suspend.cpp:171
-msgid "    UNSUSPEND  Unsuspend a given nick"
-msgstr "    UNSUSPEND  Unsuspend a given nick"
-
-#: modules/core/os_update.cpp:41
-msgid ""
-"    UPDATE      Force the Services databases to be\n"
-"                updated on disk immediately"
-msgstr ""
-"    UPDATE      Diskteki Servis veritabanının hemen\n"
-"                güncellenmesini sağlar"
-
-#: modules/core/ns_update.cpp:53
-msgid ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-msgstr ""
-"    UPDATE     Updates your current status, i.e. it checks for new memos"
-
-#: modules/core/os_userlist.cpp:93
-msgid "    USERLIST    Lists all user records"
-msgstr "    USERLIST    Tüm kullanıcı kayıtlarını listeler"
-
-#: modules/core/bs_info.cpp:65
+#: modules/core/bs_info.cpp:66
 #, c-format
 msgid "    Used on : %d channel(s)"
 msgstr "Kullanılan kanallar : %d kanalda"
 
-#: modules/core/cs_modes.cpp:199
-msgid "    VOICE      Voices a selected nick on a channel"
-msgstr "    VOICE      Voices a selected nick on a channel"
-
-#: modules/core/cs_xop.cpp:723
-msgid "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
-
-#: modules/core/cs_set_xop.cpp:117
-msgid "    XOP           Toggle the user privilege system"
-msgstr "    XOP           Ayricalik sistemleri arasinda geçisi saglar"
-
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (does not expire)"
 msgstr "   %s (does not expire)"
 
-#: modules/core/ns_group.cpp:276
+#: modules/core/ns_group.cpp:273
 #, c-format
 msgid "   %s (expires in %s)"
 msgstr "   %s (expires in %s)"
 
-#: modules/core/bs_info.cpp:89 modules/core/bs_info.cpp:92
+#: modules/core/bs_info.cpp:90 modules/core/bs_info.cpp:93
 #, c-format
 msgid "   Bad words kicker : %s"
 msgstr "          Küfürde atma : %s"
 
-#: modules/core/bs_info.cpp:87
+#: modules/core/bs_info.cpp:88
 #, c-format
 msgid "   Bad words kicker : %s (%d kick(s) to ban)"
 msgstr "          Küfürde atma : %s (%d tanede ban)"
 
-#: modules/core/ns_info.cpp:51 modules/core/ns_info.cpp:106
+#: modules/core/ns_info.cpp:100
 #, c-format
 msgid "   E-mail address: %s"
 msgstr "         E-mail adresi: %s"
 
-#: modules/core/ns_info.cpp:85
+#: modules/core/ns_info.cpp:79
 #, c-format
 msgid "   Is online from: %s"
 msgstr "      Bağlandığı adres: %s"
 
-#: modules/core/ns_info.cpp:99
+#: modules/core/ns_info.cpp:93
 #, c-format
 msgid "   Last seen time: %s"
 msgstr "   Son görüldüğü tarih: %s"
 
-#: modules/core/cs_info.cpp:75
+#: modules/core/cs_info.cpp:76
 #, c-format
 msgid "   Topic set by: %s"
 msgstr "   Topici yazan: %s"
@@ -1519,20 +875,6 @@ msgstr "   Topici yazan: %s"
 msgid "  %3d   %-30s %s"
 msgstr "  %3d   %-30s %s"
 
-#: include/language.h:110
-#, c-format
-msgid "  %3d   %-32s  %s"
-msgstr "  %3d   %-32s  %s"
-
-#: include/language.h:83
-#, c-format
-msgid ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d   %s   %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_access.cpp:53
 #, c-format
 msgid "  %3d   %s  %s"
@@ -1543,26 +885,17 @@ msgstr "  %3d   %s  %s"
 msgid "  %3d  %4d  %s"
 msgstr "  %3d  %4d  %s"
 
-#: include/language.h:85
-#, c-format
-msgid ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/cs_xop.cpp:58
 #, c-format
 msgid "  %3d  %s"
 msgstr "  %3d  %s"
 
-#: modules/core/ns_alist.cpp:118
+#: modules/core/ns_alist.cpp:125
 #, c-format
 msgid "  %3d %c%-20s %-8d %s"
 msgstr "  %3d %c%-20s %-8d %s"
 
-#: modules/core/ns_alist.cpp:115
+#: modules/core/ns_alist.cpp:122
 #, c-format
 msgid "  %3d %c%-20s %-8s %s"
 msgstr "  %3d %c%-20s %-8s %s"
@@ -1572,99 +905,82 @@ msgstr "  %3d %c%-20s %-8s %s"
 msgid "  %3d %s (%s)"
 msgstr "  %3d %s (%s)"
 
-#: modules/core/bs_info.cpp:62
+#: modules/core/os_config.cpp:185
+#, c-format
+msgid "  Name: %-15s Value: %s"
+msgstr ""
+
+#: modules/core/bs_info.cpp:63
 #, c-format
 msgid "  Real name : %s"
 msgstr "        Gerçek ismi : %s"
 
-#: modules/core/ns_info.cpp:95
+#: modules/core/ns_info.cpp:89
 #, c-format
 msgid "  Time registered: %s"
 msgstr "          Kayıt zamanı: %s"
 
-#: modules/core/bs_info.cpp:152 modules/core/bs_info.cpp:155
+#: modules/core/bs_info.cpp:153 modules/core/bs_info.cpp:156
 #, c-format
 msgid "  Underlines kicker : %s"
 msgstr "Altıçizili yazıda atma : %s"
 
-#: modules/core/bs_info.cpp:150
+#: modules/core/bs_info.cpp:151
 #, c-format
 msgid "  Underlines kicker : %s (%d kick(s) to ban)"
 msgstr "Altıçizili yazıda atma : %s (%d tanede ban)"
 
-#: modules/core/os_staff.cpp:40 modules/core/os_staff.cpp:45
+#: modules/core/os_staff.cpp:41 modules/core/os_staff.cpp:46
 #, c-format
 msgid " %c %s  %s"
 msgstr " %c %s  %s"
 
-#: modules/core/os_staff.cpp:42
+#: modules/core/os_staff.cpp:43
 #, c-format
 msgid " %c %s  %s [%s]"
 msgstr " %c %s  %s [%s]"
 
-#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:135
+#: modules/core/ms_list.cpp:40 modules/core/ms_list.cpp:136
 msgid " Num  Sender            Date/Time"
 msgstr " Num  Gönderen          Tarih/Zaman"
 
-#: src/protocol.cpp:414
+#: src/protocol.cpp:409
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 msgstr ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
 
-#: modules/core/hs_list.cpp:68 modules/core/hs_list.cpp:83
+#: modules/core/os_jupe.cpp:21
+#, fuzzy
+msgid "\"Jupiter\" a server"
+msgstr "    JUPE        Bir server'ı \"Kullanılmaz\" yapar"
+
+#: modules/core/hs_list.cpp:73 modules/core/hs_list.cpp:88
 #, c-format
 msgid "#%d Nick:%s, vhost:%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s (%s - %s)"
 
-#: modules/core/hs_list.cpp:66 modules/core/hs_list.cpp:81
+#: modules/core/hs_list.cpp:71 modules/core/hs_list.cpp:86
 #, c-format
 msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 msgstr "#%d Nick:%s, vhost:%s@%s (%s - %s)"
 
-#: modules/core/os_chanlist.cpp:50 modules/core/os_chanlist.cpp:69
+#: modules/core/os_chanlist.cpp:51 modules/core/os_chanlist.cpp:70
 #, c-format
 msgid "%-20s  %4d +%-6s %s"
 msgstr "%-20s  %4d +%-6s %s"
 
-#: modules/core/os_userlist.cpp:47 modules/core/os_userlist.cpp:69
+#: modules/core/os_userlist.cpp:48 modules/core/os_userlist.cpp:70
 #, c-format
 msgid "%-20s %s@%s"
 msgstr "%-20s %s@%s"
 
-#: include/language.h:91
-#, fuzzy, c-format
-msgid ""
-"%3d    %s\n"
-"  Added by %s on %s"
-msgstr ""
-"  %3d  %4d  %s\n"
-"    by %s, last seen %s"
-
 #: modules/core/os_session.cpp:85
 #, c-format
 msgid "%3d  %4d   %s"
 msgstr "%3d  %4d   %s"
 
-#: include/language.h:111
-#, c-format
-msgid ""
-"%3d  %s (by %s on %s; %s)\n"
-"      %s"
-msgstr ""
-"%3d  %s (%s tarafından %s tarihinde; %s)\n"
-"      %s"
-
-#: include/language.h:87
-#, c-format
-msgid ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-msgstr ""
-"%3d %s (by %s on %s)\n"
-"    %s"
-
 #: modules/core/os_session.cpp:117
 #, fuzzy, c-format
 msgid ""
@@ -1683,17 +999,12 @@ msgstr ""
 "%5d (%s by %s)\n"
 "    %s"
 
-#: modules/core/os_session.cpp:142
+#: modules/core/os_session.cpp:147
 #, c-format
 msgid "%6d    %s"
 msgstr "%6d    %s"
 
-#: modules/core/os_help.cpp:32
-#, c-format
-msgid "%s commands:"
-msgstr "%s commands:"
-
-#: modules/core/cs_mode.cpp:107
+#: modules/core/cs_mode.cpp:128
 #, fuzzy, c-format
 msgid "%c is not locked on %s."
 msgstr "%s yeni mesajlar için uyarılmayacak."
@@ -1703,34 +1014,34 @@ msgstr "%s yeni mesajlar için uyarılmayacak."
 msgid "%c%3d  %-16s  %s"
 msgstr "%c%3d  %-16s  %s"
 
-#: modules/core/cs_mode.cpp:104
+#: modules/core/cs_mode.cpp:125
 #, fuzzy, c-format
 msgid "%c%c%s has been unlocked from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: modules/core/cs_mode.cpp:60
+#: modules/core/cs_mode.cpp:81
 #, c-format
 msgid "%c%c%s locked on %s"
 msgstr ""
 
-#: modules/core/cs_mode.cpp:135
+#: modules/core/cs_mode.cpp:153
 #, fuzzy, c-format
 msgid "%c%c%s, by %s on %s"
 msgstr ""
 "%3d %s (by %s on %s)\n"
 "    %s"
 
-#: modules/core/os_modlist.cpp:203
+#: modules/core/os_modlist.cpp:204
 #, c-format
 msgid "%d Modules loaded."
 msgstr "%d Modules loaded."
 
-#: modules/core/bs_botlist.cpp:61
+#: modules/core/bs_botlist.cpp:62
 #, c-format
 msgid "%d bots available."
 msgstr "%d bot mevcut."
 
-#: modules/core/ns_group.cpp:278
+#: modules/core/ns_group.cpp:275
 #, c-format
 msgid "%d nicknames in the group."
 msgstr "Grupta %d nick var."
@@ -1741,14 +1052,14 @@ msgstr "Grupta %d nick var."
 msgid "%s %s list is empty."
 msgstr "%s kanalinin AOP listesi bos."
 
-#: modules/core/cs_access.cpp:251 modules/core/cs_access.cpp:288
-#: modules/core/cs_access.cpp:330
+#: modules/core/cs_access.cpp:257 modules/core/cs_access.cpp:294
+#: modules/core/cs_access.cpp:336
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s kanalının access listesi boş."
 
-#: modules/core/cs_akick.cpp:297 modules/core/cs_akick.cpp:347
-#: modules/core/cs_akick.cpp:398
+#: modules/core/cs_akick.cpp:296 modules/core/cs_akick.cpp:346
+#: modules/core/cs_akick.cpp:397
 #, c-format
 msgid "%s autokick list is empty."
 msgstr "%s kanalının akick listesi boş."
@@ -1758,7 +1069,7 @@ msgstr "%s kanalının akick listesi boş."
 msgid "%s bad words list is empty."
 msgstr "%s kanalının küfür listesi boş."
 
-#: modules/core/cs_set_successor.cpp:54
+#: modules/core/cs_set_successor.cpp:55
 #, c-format
 msgid "%s cannot be the successor on channel %s because he is its founder."
 msgstr "%s %s kanalında successor olamaz çünkü zaten o kanalın founderı."
@@ -1768,47 +1079,47 @@ msgstr "%s %s kanalında successor olamaz çünkü zaten o kanalın founderı."
 msgid "%s cannot receive memos."
 msgstr "%s nicki mesaj alamaz."
 
-#: modules/core/hs_help.cpp:33
+#: modules/core/hs_help.cpp:34
 #, fuzzy, c-format
 msgid "%s commands"
 msgstr "%s commands:"
 
-#: include/language.h:14
+#: modules/core/os_help.cpp:33
 #, c-format
-msgid "%s coverage is too wide; Please use a more specific mask."
-msgstr "%s kapsamı aşırı geniş; Lütfen daha belirli bir mask kullanın."
+msgid "%s commands:"
+msgstr "%s commands:"
 
-#: modules/core/ms_info.cpp:99
+#: modules/core/ms_info.cpp:100
 #, c-format
 msgid "%s currently has %d memos, of which %d are unread."
 msgstr "%s nickinin şu an %d mesajı var, %d tanesi okunmamış."
 
-#: modules/core/ms_info.cpp:97
+#: modules/core/ms_info.cpp:98
 #, c-format
 msgid "%s currently has %d memos, of which 1 is unread."
 msgstr "%s nickinin şu an %d mesajı var, 1 tanesi okunmamış."
 
-#: modules/core/ms_info.cpp:95
+#: modules/core/ms_info.cpp:96
 #, c-format
 msgid "%s currently has %d memos."
 msgstr "%s nickinin şu an %d mesajı var."
 
-#: modules/core/ms_info.cpp:93
+#: modules/core/ms_info.cpp:94
 #, c-format
 msgid "%s currently has %d memos; all of them are unread."
 msgstr "%s nickinin şu an %d mesajı var; hiçbiri okunmamış."
 
-#: modules/core/ms_info.cpp:82
+#: modules/core/ms_info.cpp:83
 #, c-format
 msgid "%s currently has 1 memo, and it has not yet been read."
 msgstr "%s nickinin şu an 1 mesajı var, ve daha okunmamış."
 
-#: modules/core/ms_info.cpp:84
+#: modules/core/ms_info.cpp:85
 #, c-format
 msgid "%s currently has 1 memo."
 msgstr "%s nickinin şu an 1 mesajı var."
 
-#: modules/core/ms_info.cpp:78
+#: modules/core/ms_info.cpp:79
 #, c-format
 msgid "%s currently has no memos."
 msgstr "%s nickinin şu an hiç mesajı yok."
@@ -1818,47 +1129,27 @@ msgstr "%s nickinin şu an hiç mesajı yok."
 msgid "%s currently has too many memos and cannot receive more."
 msgstr "%s nickinin limiti dolduğundan daha fazla mesaj alamaz."
 
-#: include/language.h:77
-#, c-format
-msgid "%s for %s set to %s."
-msgstr "%s for %s set to %s."
-
-#: include/language.h:78
-#, c-format
-msgid "%s for %s unset."
-msgstr "%s for %s unset."
-
-#: modules/core/ms_info.cpp:116
+#: modules/core/ms_info.cpp:117
 #, c-format
 msgid "%s has no memo limit."
 msgstr "%s nickinin mesaj limiti yok."
 
-#: include/language.h:98
-#, c-format
-msgid "%s has no memos."
-msgstr "%s nickinin hiç mesajı yok."
-
-#: include/language.h:102
-#, c-format
-msgid "%s has no new memos."
-msgstr "%s nickinin hiç yeni mesajı yok."
-
-#: modules/core/ns_info.cpp:77
+#: modules/core/ns_info.cpp:71
 #, c-format
 msgid "%s is %s"
 msgstr "   %s                isim: %s"
 
-#: modules/core/ns_info.cpp:80
+#: modules/core/ns_info.cpp:74
 #, c-format
 msgid "%s is a services operator of type %s."
 msgstr "%s is a services operator of type %s."
 
-#: src/protocol.cpp:451
+#: src/protocol.cpp:446
 #, c-format
 msgid "%s is currently offline."
 msgstr "%s şu an devre dışı."
 
-#: modules/core/ns_info.cpp:87
+#: modules/core/ns_info.cpp:81
 #, c-format
 msgid "%s is currently online."
 msgstr "      %s şu an bağlı."
@@ -1880,23 +1171,23 @@ msgstr "%s is enable"
 msgid "%s is no longer a Super-Admin"
 msgstr "%s is no longer a Super-Admin"
 
-#: modules/core/ms_info.cpp:129
+#: modules/core/ms_info.cpp:130
 #, c-format
 msgid "%s is not notified of new memos."
 msgstr "%s yeni mesajlar için uyarılmayacak."
 
-#: modules/core/ms_info.cpp:123
+#: modules/core/ms_info.cpp:124
 #, c-format
 msgid "%s is notified of new memos at logon and when they arrive."
 msgstr ""
 "%s yeni mesajlar için bağlandığında ve mesajlar ulaştığı anda uyarılacak."
 
-#: modules/core/ms_info.cpp:127
+#: modules/core/ms_info.cpp:128
 #, c-format
 msgid "%s is notified of news memos at logon."
 msgstr "%s yeni mesajlar için bağlandığında uyarılacak."
 
-#: modules/core/ms_info.cpp:125
+#: modules/core/ms_info.cpp:126
 #, c-format
 msgid "%s is notified when new memos arrive."
 msgstr "%s yeni mesajlar ulaştığı anda uyarılacak."
@@ -1915,6 +1206,11 @@ msgstr ""
 "%s kanali AOP listesi:\n"
 "  Num  Nick"
 
+#: modules/core/os_config.cpp:177
+#, c-format
+msgid "%s settings:"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:63
 #, fuzzy, c-format
 msgid "%s was not found on your auto join list."
@@ -1956,63 +1252,66 @@ msgstr ""
 msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) bot listesine eklendi."
 
-#: modules/core/ms_info.cpp:104 modules/core/ms_info.cpp:111
+#: modules/core/ms_info.cpp:105 modules/core/ms_info.cpp:112
 #, c-format
 msgid "%s's memo limit is %d, and may not be changed."
 msgstr "%s nickinin mesaj limiti %d, ve değiştirilemez."
 
-#: modules/core/ms_info.cpp:106 modules/core/ms_info.cpp:113
+#: modules/core/ms_info.cpp:107 modules/core/ms_info.cpp:114
 #, c-format
 msgid "%s's memo limit is %d."
 msgstr "%s nickinin mesaj limiti %d."
 
-#: modules/core/os_defcon.cpp:341
+#: modules/core/os_defcon.cpp:344
 msgid "* AKILL any new clients connecting"
 msgstr "* AKILL any new clients connecting"
 
-#: modules/core/os_defcon.cpp:331
+#: modules/core/os_defcon.cpp:334
 #, c-format
 msgid "* Force Chan Modes (%s) to be set on all channels"
 msgstr "* Force Chan Modes (%s) to be set on all channels"
 
-#: modules/core/os_defcon.cpp:337
+#: modules/core/os_defcon.cpp:340
 msgid "* Ignore any non-opers with message"
 msgstr "* Ignore any non-opers with message"
 
-#: modules/core/os_defcon.cpp:335
+#: modules/core/os_defcon.cpp:338
 msgid "* Kill any NEW clients connecting"
 msgstr "* Kill any NEW clients connecting"
 
-#: modules/core/os_defcon.cpp:329
+#: modules/core/os_defcon.cpp:332
 msgid "* No MLOCK changes"
 msgstr "* No MLOCK changes"
 
-#: modules/core/os_defcon.cpp:325
+#: modules/core/os_defcon.cpp:328
 msgid "* No new channel registrations"
 msgstr "* No new channel registrations"
 
-#: modules/core/os_defcon.cpp:343
+#: modules/core/os_defcon.cpp:346
 msgid "* No new memos sent"
 msgstr "* No new memos sent"
 
-#: modules/core/os_defcon.cpp:327
+#: modules/core/os_defcon.cpp:330
 msgid "* No new nick registrations"
 msgstr "* No new nick registrations"
 
-#: modules/core/os_defcon.cpp:339
+#: modules/core/os_defcon.cpp:342
 msgid "* Silently ignore non-opers"
 msgstr "* Silently ignore non-opers"
 
-#: modules/core/os_defcon.cpp:333
+#: modules/core/os_defcon.cpp:336
 #, c-format
 msgid "* Use the reduced session limit of %d"
 msgstr "* Use the reduced session limit of %d"
 
-#: include/language.h:37
-msgid "<unknown>"
-msgstr "<varolmayan>"
+#: modules/core/ns_set_email.cpp:84
+#, c-format
+msgid ""
+"A confirmation email has been sent to %s. Follow the instructions in it to "
+"change your email address."
+msgstr ""
 
-#: modules/core/ms_sendall.cpp:44
+#: modules/core/ms_sendall.cpp:45
 msgid "A massmemo has been sent to all registered users."
 msgstr "A massmemo has been sent to all registered users."
 
@@ -2025,39 +1324,30 @@ msgstr ""
 "A notification memo has been sent to %s informing him/her you have\n"
 "read his/her memo."
 
-#: modules/core/ns_register.cpp:287
-#, fuzzy
+#: modules/core/ns_register.cpp:202
+#, fuzzy, c-format
 msgid ""
 "A passcode has been sent to %s, please type %s%s confirm <passcode> to "
-"complete registration.\n"
-"If you need to cancel your registration, use \"%s%s drop <password>\"."
+"confirm your email address."
 msgstr ""
 "A passcode has been sent to %s, please type /msg %s confirm <passcode> to "
 "complete registration"
 
-#: include/language.h:114
-msgid "A vhost ident must be in the format of a valid ident"
-msgstr "A vhost ident must be in the format of a valid ident"
-
-#: include/language.h:113
-msgid "A vhost must be in the format of a valid hostmask."
-msgstr "Error! A vhost can only contain A-Z, a-z, 0-9, '.' and '-'."
-
-#: modules/core/cs_access.cpp:524
+#: modules/core/cs_access.cpp:532
 #, fuzzy
 msgid "ACCESS channel {ADD|DEL|LIST|VIEW|CLEAR} [mask [level] | entry-list]"
 msgstr ""
 "ACCESS kanaladı {ADD|DEL|LIST|VIEW|CLEAR} [nick [seviye] | kayıt-listesi]"
 
-#: modules/core/ns_access.cpp:180
+#: modules/core/ns_access.cpp:181
 msgid "ACCESS {ADD | DEL | LIST} [mask]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
 
-#: modules/core/bs_act.cpp:62
+#: modules/core/bs_act.cpp:63
 msgid "ACT channel text"
 msgstr "ACT kanaladı yazı"
 
-#: modules/core/ns_ajoin.cpp:105
+#: modules/core/ns_ajoin.cpp:106
 #, fuzzy
 msgid "AJOIN {ADD | DEL | LIST} [channel] [key]"
 msgstr "ACCESS {ADD | DEL | LIST} [mask]"
@@ -2071,17 +1361,22 @@ msgstr ""
 "AKICK kanaladı {ADD | STICK | UNSTICK | DEL | LIST | VIEW | ENFORCE | CLEAR} "
 "[nick-veya-usermask] [sebep]"
 
-#: modules/core/cs_akick.cpp:461
+#: modules/core/cs_akick.cpp:460
 #, c-format
 msgid "AKICK ENFORCE for %s complete; %d users were affected."
 msgstr " %s için AKICK uygulaması tamam; %d kullanıcı için geçerli."
 
-#: modules/core/os_akill.cpp:253 modules/core/os_akill.cpp:288
-#: modules/core/os_akill.cpp:333
+#: modules/core/os_chankill.cpp:21
+#, fuzzy
+msgid "AKILL all users on a specific channel"
+msgstr "    CHANKILL    AKILL all users on a specific channel"
+
+#: modules/core/os_akill.cpp:222 modules/core/os_akill.cpp:257
+#: modules/core/os_akill.cpp:302
 msgid "AKILL list is empty."
 msgstr "AKILL listesi boş."
 
-#: modules/core/os_akill.cpp:454
+#: modules/core/os_akill.cpp:424
 #, fuzzy
 msgid ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -2090,43 +1385,34 @@ msgstr ""
 "AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaşımı] {mask | kayıt-no} "
 "[sebep]]"
 
-#: modules/core/cs_xop.cpp:525
+#: modules/core/cs_xop.cpp:521
 msgid "AOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/core/bs_assign.cpp:81
+#: modules/core/bs_assign.cpp:82
 msgid "ASSIGN chan nick"
 msgstr "ASSIGN kanaladı nick"
 
-#: include/language.h:17
-msgid "Access denied."
-msgstr "Bu komuta erişiminiz yok."
-
-#: modules/core/cs_access.cpp:223
+#: modules/core/cs_access.cpp:229
 #, c-format
 msgid "Access level for %s on %s changed to %d."
 msgstr "%s nickinin access seviyesi %s kanalında %d olarak değiştirildi."
 
-#: modules/core/cs_access.cpp:215
+#: modules/core/cs_access.cpp:221
 #, c-format
 msgid "Access level for %s on %s unchanged from %d."
 msgstr "%s nickinin access seviyesi %s kanalında zaten %d."
 
-#: include/language.h:80
-#, c-format
-msgid "Access level must be between %d and %d inclusive."
-msgstr "Access seviyesi %d ve %d arasında olmalıdır."
-
-#: modules/core/cs_access.cpp:184
+#: modules/core/cs_access.cpp:190
 msgid "Access level must be non-zero."
 msgstr "Access seviyesi sıfırdan farklı bir sayı olmalıdır."
 
-#: modules/core/cs_access.cpp:612
+#: modules/core/cs_access.cpp:625
 #, c-format
 msgid "Access level settings for channel %s:"
 msgstr "%s kanalı için access level ayarları:"
 
-#: modules/core/cs_access.cpp:652
+#: modules/core/cs_access.cpp:665
 #, c-format
 msgid "Access levels for %s reset to defaults."
 msgstr "%s için access levelleri varsayılanlarla değiştirildi."
@@ -2141,20 +1427,11 @@ msgstr "Access list for %s is empty."
 msgid "Access list for %s:"
 msgstr "%s nickinin access listesi:"
 
-#: include/language.h:81
-#, fuzzy, c-format
-msgid ""
-"Access list for %s:\n"
-"  Num   Lev  Mask"
-msgstr ""
-"%s kanalı için access listesi:\n"
-"  Sıra   Seviye  Nick"
-
 #: modules/core/ns_access.cpp:106
 msgid "Access list:"
 msgstr "Access listesi:"
 
-#: src/commands.cpp:207
+#: src/commands.cpp:212
 #, c-format
 msgid ""
 "Access to this command requires the permission %s to be present in your "
@@ -2163,6 +1440,16 @@ msgstr ""
 "Access to this command requires the permission %s to be present in your "
 "opertype."
 
+#: modules/core/cs_set_secure.cpp:21
+#, fuzzy, c-format
+msgid "Activate %s's security features"
+msgstr "    SECURE        %s güvenlik özelliklerini aktifleştirir"
+
+#: modules/core/hs_on.cpp:21
+#, fuzzy
+msgid "Activates your assigned vhost"
+msgstr "    ON          Activates your assigned vhost"
+
 #: modules/core/ns_ajoin.cpp:46
 #, fuzzy, c-format
 msgid "Added %s to your auto join list."
@@ -2183,7 +1470,7 @@ msgstr "Yeni operatör haberleri maddesi eklendi (#%d)."
 msgid "Added new random news item (#%d)."
 msgstr "Yeni karisik haber eklendi (#%d)."
 
-#: modules/core/ns_register.cpp:160
+#: modules/core/ns_register.cpp:78
 msgid ""
 "Additionally, Services Operators with the nickserv/confirm permission can\n"
 "replace passcode with a users nick to force validate them."
@@ -2196,22 +1483,22 @@ msgstr ""
 msgid "All O:lines of %s have been removed."
 msgstr "%s serverındaki tüm O:line lar silindi."
 
-#: modules/core/os_noop.cpp:55
+#: modules/core/os_noop.cpp:54
 #, c-format
 msgid "All O:lines of %s have been reset."
 msgstr "%s serverındaki tüm O:line lar resetlendi."
 
-#: modules/core/cs_clone.cpp:114
+#: modules/core/cs_clone.cpp:115
 #, fuzzy, c-format
 msgid "All access entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:128
+#: modules/core/cs_clone.cpp:129
 #, fuzzy, c-format
 msgid "All akick entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clone.cpp:139
+#: modules/core/cs_clone.cpp:140
 #, fuzzy, c-format
 msgid "All badword entries from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
@@ -2220,12 +1507,12 @@ msgstr "All vhost's in the group %s have been set to %s"
 msgid "All logon news items deleted."
 msgstr "Tüm bağlantı haberleri silindi."
 
-#: modules/core/ms_del.cpp:117
+#: modules/core/ms_del.cpp:118
 #, c-format
 msgid "All memos for channel %s have been deleted."
 msgstr "All memos for channel %s have been deleted."
 
-#: modules/core/ms_del.cpp:119
+#: modules/core/ms_del.cpp:120
 msgid "All of your memos have been deleted."
 msgstr "Tüm mesajlarınız silindi."
 
@@ -2237,22 +1524,22 @@ msgstr "Tüm operatör haberleri maddeleri silindi."
 msgid "All random news items deleted."
 msgstr "Tüm karisik haberler silindi."
 
-#: modules/core/cs_clone.cpp:103
+#: modules/core/cs_clone.cpp:104
 #, fuzzy, c-format
 msgid "All settings from %s have been transferred to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/cs_clearusers.cpp:47
+#: modules/core/cs_clearusers.cpp:48
 #, fuzzy, c-format
 msgid "All users have been kicked from %s."
 msgstr "%s kanalındaki tüm kullanıcılar atıldı."
 
-#: modules/core/hs_group.cpp:33
+#: modules/core/hs_group.cpp:34
 #, c-format
 msgid "All vhost's in the group %s have been set to %s"
 msgstr "All vhost's in the group %s have been set to %s"
 
-#: modules/core/hs_group.cpp:31
+#: modules/core/hs_group.cpp:32
 #, c-format
 msgid "All vhost's in the group %s have been set to %s@%s"
 msgstr "All vhost's in the group %s have been set to %s@%s"
@@ -2374,12 +1661,34 @@ msgstr "Kanalda fantazi komutlarını kullanmaya izinlidir. "
 msgid "Allowed to view the access list"
 msgstr "Kanalın Access listesini görüntülemeye izinlidir."
 
-#: modules/core/ns_info.cpp:126
+#: modules/core/bs_info.cpp:46
+#, fuzzy
+msgid "Allows you to see BotServ information about a channel or a bot"
+msgstr ""
+"INFO               Allows you to see BotServ information about a channel or "
+"a bot"
+
+#: modules/core/bs_assign.cpp:21
+#, fuzzy
+msgid "Assigns a bot to a channel"
+msgstr "ASSIGN             Kanala bot sokar"
+
+#: modules/core/ns_set_greet.cpp:21
+#, fuzzy
+msgid "Associate a greet message with your nickname"
+msgstr "    GREET      Nickiniz için bir karşılama mesajı belirler"
+
+#: modules/core/ns_set_email.cpp:49
+#, fuzzy
+msgid "Associate an E-mail address with your nickname"
+msgstr "    EMAIL      Nickinizle bir email adresini ilişkilendirir"
+
+#: modules/core/ns_info.cpp:120
 msgid "Auto-op"
 msgstr "Auto-op"
 
 #: modules/core/cs_akick.cpp:78 modules/core/cs_akick.cpp:105
-#: modules/core/cs_akick.cpp:375 modules/core/cs_akick.cpp:426
+#: modules/core/cs_akick.cpp:374 modules/core/cs_akick.cpp:425
 #, c-format
 msgid "Autokick list for %s:"
 msgstr "%s kanalının akick listesi:"
@@ -2404,16 +1713,16 @@ msgstr "Automatic mode +q"
 msgid "Automatic mode +v"
 msgstr "Kanala girişte ChanServ tarafından otomatik voice (+v)"
 
-#: modules/core/bs_badwords.cpp:312
+#: modules/core/bs_badwords.cpp:314
 msgid ""
 "BADWORDS channel {ADD|DEL|LIST|CLEAR} [word | entry-list] [SINGLE|START|END]"
 msgstr "BADWORDS kanaladı {ADD|DEL|LIST|CLEAR} [nick | kayıt-listesi]"
 
-#: modules/core/cs_ban.cpp:90
+#: modules/core/cs_ban.cpp:91
 msgid "BAN #channel nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/core/bs_bot.cpp:409
+#: modules/core/bs_bot.cpp:410
 msgid ""
 "BOT ADD nick user host real\n"
 "BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -2432,26 +1741,26 @@ msgstr ""
 "%s kanalının küfür listesi:\n"
 "  Sayı   Kelime                           Tipi"
 
-#: modules/core/bs_badwords.cpp:224
+#: modules/core/bs_badwords.cpp:225
 msgid "Bad words list is now empty."
 msgstr "Küfür listesi şimdi boş."
 
-#: modules/core/cs_set_bantype.cpp:38
+#: modules/core/cs_set_bantype.cpp:33
 #, c-format
 msgid "Ban type for channel %s is now #%d."
 msgstr "%s kanalının ban tipi #%d olarak değiştirildi."
 
+#: modules/core/cs_ban.cpp:21
+#, fuzzy
+msgid "Bans a selected nick on a channel"
+msgstr "    BAN        Bans a selected nick on a channel"
+
 #: modules/core/bs_bot.cpp:29 modules/core/bs_bot.cpp:210
 #, c-format
 msgid "Bot %s already exists."
 msgstr "%s nickli bot zaten var."
 
-#: include/language.h:103
-#, c-format
-msgid "Bot %s does not exist."
-msgstr "Bot %s mevcut değil."
-
-#: modules/core/bs_assign.cpp:65
+#: modules/core/bs_assign.cpp:66
 #, c-format
 msgid "Bot %s has been assigned to %s."
 msgstr "%s botu %s kanalına sokuldu."
@@ -2466,27 +1775,27 @@ msgstr "%s botu %s!%s@%s (%s) olarak değiştirildi."
 msgid "Bot %s has been deleted."
 msgstr "%s botu silindi."
 
-#: modules/core/bs_assign.cpp:57
+#: modules/core/bs_assign.cpp:58
 #, c-format
 msgid "Bot %s is already assigned to channel %s."
 msgstr "Bot %s is already assigned to channel %s."
 
-#: modules/core/bs_set.cpp:78
+#: modules/core/bs_set.cpp:79
 #, c-format
 msgid "Bot will kick ops on channel %s."
 msgstr "Bot %s kanalında oplarıda atacak."
 
-#: modules/core/bs_set.cpp:93
+#: modules/core/bs_set.cpp:94
 #, c-format
 msgid "Bot will kick voices on channel %s."
 msgstr "Bot %s kanalında voicelarıda atacak."
 
-#: modules/core/bs_set.cpp:73
+#: modules/core/bs_set.cpp:74
 #, c-format
 msgid "Bot won't kick ops on channel %s."
 msgstr "Bot %s kanalında opları atmayacak ."
 
-#: modules/core/bs_set.cpp:88
+#: modules/core/bs_set.cpp:89
 #, c-format
 msgid "Bot won't kick voices on channel %s."
 msgstr "Bot %s kanalında voiceları atmayacak."
@@ -2516,16 +1825,11 @@ msgstr "Bot Idents may only contain valid characters."
 msgid "Bot Nicks may only contain valid nick characters."
 msgstr "Bot Nicks may only contain valid nick characters."
 
-#: include/language.h:106
-#, c-format
-msgid "Bot is not on channel %s."
-msgstr "Bot %s kanalında değil."
-
-#: modules/core/bs_botlist.cpp:35
+#: modules/core/bs_botlist.cpp:36
 msgid "Bot list:"
 msgstr "Bot listesi:"
 
-#: modules/core/bs_help.cpp:45
+#: modules/core/bs_help.cpp:48
 #, c-format
 msgid ""
 "Bot will join a channel whenever there is at least\n"
@@ -2534,7 +1838,7 @@ msgid ""
 "name with a %c."
 msgstr ""
 
-#: modules/core/bs_kick.cpp:72
+#: modules/core/bs_kick.cpp:75
 #, c-format
 msgid ""
 "Bot will now kick bad words, and will place a ban after \n"
@@ -2545,7 +1849,7 @@ msgstr ""
 "aynı kullanıcıyı banlayacak. BADWORDS komutunu\n"
 "kullanarak küfür ekleyip çıkarabilirsiniz."
 
-#: modules/core/bs_kick.cpp:76
+#: modules/core/bs_kick.cpp:79
 msgid ""
 "Bot will now kick bad words. Use the BADWORDS command\n"
 "to add or remove a bad word."
@@ -2553,7 +1857,7 @@ msgstr ""
 "Bot şimdi küfürlerde atacak. BADWORDS komutunu kullanarak\n"
 "listeye küfür ekleyip silebilirsiniz."
 
-#: modules/core/bs_kick.cpp:105
+#: modules/core/bs_kick.cpp:111
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick bolds, and will place a ban after\n"
@@ -2562,11 +1866,11 @@ msgstr ""
 "Bot şimdi kalın yazıda atacak, ve \n"
 "%d atma sonrasında aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:107
+#: modules/core/bs_kick.cpp:113
 msgid "Bot will now kick bolds."
 msgstr "Bot şimdi kalın yazıda atacak."
 
-#: modules/core/bs_kick.cpp:153
+#: modules/core/bs_kick.cpp:166
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2577,7 +1881,7 @@ msgstr ""
 "%d karakterini ve %d%% kadarını içermelidir), ve \n"
 "%d atma sonrasında aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:157
+#: modules/core/bs_kick.cpp:170
 #, c-format
 msgid ""
 "Bot will now kick caps (they must constitute at least\n"
@@ -2586,7 +1890,7 @@ msgstr ""
 "Bot şimdi büyük yazıda atacak(Tüm mesajın en az\n"
 "%d karakterini ve %d%% kadarını içermelidir)."
 
-#: modules/core/bs_kick.cpp:186
+#: modules/core/bs_kick.cpp:203
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick colors, and will place a ban after %d\n"
@@ -2595,11 +1899,11 @@ msgstr ""
 "Bot şimdi renkli yazıda atacak, ve \n"
 "%d atma sonrasında aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:188
+#: modules/core/bs_kick.cpp:205
 msgid "Bot will now kick colors."
 msgstr "Bot şimdi renkli yazıda atacak."
 
-#: modules/core/bs_kick.cpp:234
+#: modules/core/bs_kick.cpp:260
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick flood (%d lines in %d seconds and\n"
@@ -2608,12 +1912,12 @@ msgstr ""
 "Bot şimdi text floodda atacak(%d sira %d saniyede), ve \n"
 "%d atma sonrasında aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:236
+#: modules/core/bs_kick.cpp:262
 #, c-format
 msgid "Bot will now kick flood (%d lines in %d seconds)."
 msgstr "Bot şimdi text floodda atacak(%d sıra %d saniyede)."
 
-#: modules/core/bs_kick.cpp:367
+#: modules/core/bs_kick.cpp:409
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick italics, and will place a ban after\n"
@@ -2622,11 +1926,11 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:369
+#: modules/core/bs_kick.cpp:411
 msgid "Bot will now kick italics."
 msgstr "Bot will now kick italics."
 
-#: modules/core/bs_kick.cpp:274
+#: modules/core/bs_kick.cpp:305
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2637,7 +1941,7 @@ msgstr ""
 "aynı şeyi söylerse), ve %d atma sonrasında\n"
 "aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:278
+#: modules/core/bs_kick.cpp:309
 #, c-format
 msgid ""
 "Bot will now kick repeats (users that say %d times\n"
@@ -2646,7 +1950,7 @@ msgstr ""
 "Bot şimdi tekrarda atacak(kullanıcı %d kez\n"
 "aynı şeyi söylerse)."
 
-#: modules/core/bs_kick.cpp:307
+#: modules/core/bs_kick.cpp:341
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick reverses, and will place a ban after %d\n"
@@ -2655,11 +1959,11 @@ msgstr ""
 "Bot şimdi Ctrl+R de atacak, ve %d atma sonrasında \n"
 "aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:309
+#: modules/core/bs_kick.cpp:343
 msgid "Bot will now kick reverses."
 msgstr "Bot şimdi Ctrl+R de atacak."
 
-#: modules/core/bs_kick.cpp:337
+#: modules/core/bs_kick.cpp:375
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick underlines, and will place a ban after %d\n"
@@ -2668,16 +1972,16 @@ msgstr ""
 "Bot şimdi altıçizili yazıda atacak, ve %d atma \n"
 "sonrasında aynı kullanıcıyı banlayacak."
 
-#: modules/core/bs_kick.cpp:339
+#: modules/core/bs_kick.cpp:377
 msgid "Bot will now kick underlines."
 msgstr "Bot şimdi altıçizili yazıda atacak."
 
-#: modules/core/bs_kick.cpp:398
+#: modules/core/bs_kick.cpp:445
 #, fuzzy
 msgid "Bot will now kick for amsgs"
 msgstr "Bot şimdi renkli yazıda atacak."
 
-#: modules/core/bs_kick.cpp:396
+#: modules/core/bs_kick.cpp:443
 #, fuzzy, c-format
 msgid ""
 "Bot will now kick for amsgs, and will place a ban after %d\n"
@@ -2686,182 +1990,207 @@ msgstr ""
 "Bot will now kick italics, and will place a ban after %d\n"
 "kicks for the same user."
 
-#: modules/core/bs_kick.cpp:82
+#: modules/core/bs_kick.cpp:85
 msgid "Bot won't kick bad words anymore."
 msgstr "Bot artık küfürlerde atmayacak."
 
-#: modules/core/bs_kick.cpp:112
+#: modules/core/bs_kick.cpp:118
 msgid "Bot won't kick bolds anymore."
 msgstr "Bot artık kalın yazıda atmayacak."
 
-#: modules/core/bs_kick.cpp:163
+#: modules/core/bs_kick.cpp:176
 msgid "Bot won't kick caps anymore."
 msgstr "Bot artık büyük yazıda atmayacak."
 
-#: modules/core/bs_kick.cpp:193
+#: modules/core/bs_kick.cpp:210
 msgid "Bot won't kick colors anymore."
 msgstr "Bot artık renkli yazıda atmayacak."
 
-#: modules/core/bs_kick.cpp:241
+#: modules/core/bs_kick.cpp:267
 msgid "Bot won't kick flood anymore."
 msgstr "Bot artık text floodda atmayacak."
 
-#: modules/core/bs_kick.cpp:374
+#: modules/core/bs_kick.cpp:416
 msgid "Bot won't kick italics anymore."
 msgstr "Bot won't kick italics anymore."
 
-#: modules/core/bs_kick.cpp:284
+#: modules/core/bs_kick.cpp:315
 msgid "Bot won't kick repeats anymore."
 msgstr "Bot artık tekrarda atmayacak."
 
-#: modules/core/bs_kick.cpp:314
+#: modules/core/bs_kick.cpp:348
 msgid "Bot won't kick reverses anymore."
 msgstr "Bot artık Ctrl+R de atmayacak."
 
-#: modules/core/bs_kick.cpp:344
+#: modules/core/bs_kick.cpp:382
 msgid "Bot won't kick underlines anymore."
 msgstr "Bot artık altıçizili yazıda atmayacak."
 
-#: modules/core/bs_kick.cpp:403
+#: modules/core/bs_kick.cpp:450
 #, fuzzy
 msgid "Bot won't kick for amsgs anymore."
 msgstr "Bot artık büyük yazıda atmayacak."
 
-#: modules/core/os_stats.cpp:215
+#: modules/core/os_stats.cpp:177
 #, c-format
 msgid "BotServ       : %6d records, %5d kB"
 msgstr "BotServ    : %6d kayıt, %5d kB"
 
-#: modules/core/bs_botlist.cpp:43
+#: modules/core/bs_botlist.cpp:44
 msgid "Bots reserved to IRC operators:"
 msgstr "IRCoplara ayrilmis botlar:"
 
-#: modules/core/os_stats.cpp:199
+#: modules/core/os_stats.cpp:161
 #, c-format
 msgid "Bytes read    : %5d kB"
 msgstr "Okunan veri  : %5d kB"
 
-#: modules/core/os_stats.cpp:200
+#: modules/core/os_stats.cpp:162
 #, c-format
 msgid "Bytes written : %5d kB"
 msgstr "Yazılan veri : %5d kB"
 
-#: modules/core/ms_cancel.cpp:68
+#: modules/core/ms_cancel.cpp:69
 msgid "CANCEL {nick | channel}"
 msgstr "CANCEL {nick | kanaladı}"
 
-#: modules/core/os_chankill.cpp:99
+#: modules/core/ns_cert.cpp:182
+#, fuzzy
+msgid "CERT {ADD|DEL|LIST} [fingerprint]"
+msgstr "OPERNEWS {ADD|DEL|LIST} [yazı|num]"
+
+#: modules/core/os_chankill.cpp:100
 msgid "CHANKILL [+expiry] {#channel} [reason]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/core/ms_check.cpp:80
+#: modules/core/ms_check.cpp:81
 msgid "CHECK nickname"
 msgstr "CHECK nickname"
 
-#: modules/core/cs_clearusers.cpp:65
+#: modules/core/cs_clearusers.cpp:66
 #, fuzzy
 msgid "CLEARUSERS channel"
 msgstr "CLEARMODES kanaladı [ALL]"
 
-#: modules/core/cs_clone.cpp:165
+#: modules/core/cs_clone.cpp:166
 #, fuzzy
 msgid "CLONE channel target"
 msgstr "CLEAR kanaladı neyi"
 
-#: modules/core/ns_register.cpp:379
+#: modules/core/os_config.cpp:213
+msgid "CONFIG {MODIFY|VIEW} [block name item name item value]"
+msgstr ""
+
+#: modules/core/ms_cancel.cpp:23
+#, fuzzy
+msgid "Cancel last memo you sent"
+msgstr "    CANCEL Son gönderilen mesajı iptal eder"
+
+#: modules/core/cs_drop.cpp:23
+#, fuzzy
+msgid "Cancel the registration of a channel"
+msgstr "    DROP       Kanal kaydını siler"
+
+#: modules/core/ns_drop.cpp:22
+#, fuzzy
+msgid "Cancel the registration of a nickname"
+msgstr "    DROP       Nickin kaydını siler"
+
+#: modules/core/ns_register.cpp:284
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Şu an mail gönderilemiyor; lütfen az sonra tekrar deneyin."
 
-#: modules/core/os_stats.cpp:211
+#: modules/core/ns_cert.cpp:114
+#, fuzzy
+msgid "Cert list:"
+msgstr "Bot listesi:"
+
+#: modules/core/ns_cert.cpp:23
+#, fuzzy, c-format
+msgid "Certificate list for %s is empty."
+msgstr "Access list for %s is empty."
+
+#: modules/core/ns_cert.cpp:33
+#, fuzzy, c-format
+msgid "Certificate list for %s:"
+msgstr "%s nickinin access listesi:"
+
+#: modules/core/os_stats.cpp:173
 #, c-format
 msgid "ChanServ      : %6d records, %5d kB"
 msgstr "ChanServ   : %6d kayıt, %5d kB"
 
-#: modules/core/os_umode.cpp:46
-#, c-format
-msgid "Changed usermodes of %s."
-msgstr "Changed usermodes of %s."
+#: modules/core/os_mode.cpp:21
+#, fuzzy
+msgid "Change channel or user modes"
+msgstr "%s changed your usermodes."
 
-#: include/language.h:29
-#, c-format
-msgid "Channel %s doesn't exist."
-msgstr "%s kanalı şu an kullanımda değil."
+#: modules/core/ns_set_message.cpp:21
+#, fuzzy
+msgid "Change the communication method of Services"
+msgstr "    MSG        Change the communication method of Services"
+
+#: modules/core/os_mode.cpp:52
+#, fuzzy, c-format
+msgid "Changed usermodes of %s to %s."
+msgstr "Changed usermodes of %s."
 
-#: modules/core/cs_drop.cpp:74
+#: modules/core/cs_drop.cpp:75
 #, c-format
 msgid "Channel %s has been dropped."
 msgstr "%s kanalının kaydı silinmiştir (dropped)."
 
-#: include/language.h:31
-#, c-format
-msgid ""
-"Channel %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"%s kanalı yasaklanmıştır. %s:\n"
-"%s"
-
-#: modules/core/cs_register.cpp:46
+#: modules/core/cs_register.cpp:45
 #, c-format
 msgid "Channel %s is already registered!"
 msgstr "%s kanalı zaten kayıtlı!"
 
-#: modules/core/cs_set_persist.cpp:95
+#: modules/core/cs_set_persist.cpp:96
 #, c-format
 msgid "Channel %s is no longer persistant."
 msgstr "Channel %s is no longer persistant."
 
-#: modules/core/cs_forbid.cpp:91
+#: modules/core/cs_forbid.cpp:90
 #, c-format
 msgid "Channel %s is now forbidden."
 msgstr "%s kanalının Kullanımı yasaklandı."
 
-#: modules/core/cs_set_persist.cpp:68
+#: modules/core/cs_set_persist.cpp:69
 #, c-format
 msgid "Channel %s is now persistant."
 msgstr "Channel %s is now persistant."
 
-#: modules/core/cs_suspend.cpp:134
+#: modules/core/cs_suspend.cpp:123
 #, c-format
 msgid "Channel %s is now released."
 msgstr "Channel %s is now released."
 
-#: modules/core/cs_suspend.cpp:70
+#: modules/core/cs_suspend.cpp:68
 #, c-format
 msgid "Channel %s is now suspended."
 msgstr "Channel %s is now suspended."
 
-#: include/language.h:28
-#, c-format
-msgid "Channel %s isn't registered."
-msgstr "%s kanalı kayıtlı değil."
-
-#: include/language.h:30
-#, c-format
-msgid "Channel %s may not be registered or used."
-msgstr "%s kanalı kayıt edilemez ve kullanılamaz."
-
-#: modules/core/cs_suspend.cpp:41
+#: modules/core/cs_suspend.cpp:42
 #, c-format
 msgid "Channel %s may not be registered."
 msgstr "%s kanalı kayıt edilemez."
 
-#: modules/core/cs_register.cpp:69
+#: modules/core/cs_register.cpp:68
 #, c-format
 msgid "Channel %s registered under your nickname: %s"
 msgstr "%s kanalı bu nicke kayıt edildi: %s"
 
-#: modules/core/os_stats.cpp:205
+#: modules/core/os_stats.cpp:167
 #, c-format
 msgid "Channel       : %6d records, %5d kB"
 msgstr "Kanal      : %6d kayıt, %5d kB"
 
-#: modules/core/cs_saset_noexpire.cpp:37
+#: modules/core/cs_saset_noexpire.cpp:38
 #, c-format
 msgid "Channel %s will expire."
 msgstr "%s kanalı zaman aşımına eklendi."
 
-#: modules/core/cs_saset_noexpire.cpp:32
+#: modules/core/cs_saset_noexpire.cpp:33
 #, c-format
 msgid "Channel %s will not expire."
 msgstr "%s kanalı zaman aşımından çıkarıldı."
@@ -2871,33 +2200,28 @@ msgstr "%s kanalı zaman aşımından çıkarıldı."
 msgid "Channel %s %s list has been cleared."
 msgstr "Kanalin %s AOP listesi temizlendi."
 
-#: modules/core/cs_access.cpp:378
+#: modules/core/cs_access.cpp:384
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanal %s access listesi temizlendi."
 
-#: modules/core/cs_akick.cpp:472
+#: modules/core/cs_akick.cpp:471
 #, c-format
 msgid "Channel %s akick list has been cleared."
 msgstr "Kanal %s akick listesi temizlendi."
 
-#: modules/core/cs_mode.cpp:117
+#: modules/core/cs_mode.cpp:138
 #, fuzzy, c-format
 msgid "Channel %s has no mode locks."
 msgstr "Channel %s is now released."
 
-#: include/language.h:70
-#, c-format
-msgid "Channel %s is not a valid channel."
-msgstr "Channel %s is not a valid channel."
-
-#: src/operserv.cpp:676
+#: src/operserv.cpp:672
 msgid "Channel SQLINEs are not supported by your IRCd, so you can't use them."
 msgstr ""
 "SQLINE kullandiginiz IRCd tarafindan desteklenmiyor, bu yüzden "
 "kullanmazsiniz."
 
-#: modules/core/os_chanlist.cpp:55
+#: modules/core/os_chanlist.cpp:56
 msgid ""
 "Channel list:\n"
 "Name                 Users Modes   Topic"
@@ -2905,7 +2229,7 @@ msgstr ""
 "Kanal listesi:\n"
 "İsim              Kullanici Modlari  Konu"
 
-#: modules/core/ns_alist.cpp:91
+#: modules/core/ns_alist.cpp:98
 #, c-format
 msgid ""
 "Channels that %s has access on:\n"
@@ -2914,7 +2238,7 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/ns_alist.cpp:94
+#: modules/core/ns_alist.cpp:101
 msgid ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description"
@@ -2922,16 +2246,47 @@ msgstr ""
 "Channels that you have access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/core/cs_suspend.cpp:121
+#: modules/core/ms_check.cpp:21
+#, fuzzy
+msgid "Checks if last memo to a nick was read"
+msgstr "    CHECK  Checks if last memo to a nick was read"
+
+#: modules/core/bs_set.cpp:22
+#, fuzzy
+msgid "Configures bot options"
+msgstr "SET                Bot özelliklerini ayarlar"
+
+#: modules/core/bs_kick.cpp:22
+#, fuzzy
+msgid "Configures kickers"
+msgstr "KICK               Atma özelliklerini ayarlar"
+
+#: modules/core/ns_register.cpp:24
+#, fuzzy
+msgid "Confirm an auth code"
+msgstr "    CONFIRM    Confirm a nickserv auth code"
+
+#: modules/core/cs_mode.cpp:305
+#, fuzzy
+msgid "Control modes and mode locks on a channel"
+msgstr "    CLEARMODES  Bir kanalın modlarını temizler"
+
+#: modules/core/cs_clone.cpp:21
+#, fuzzy
+msgid "Copy all settings from one channel to another"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_suspend.cpp:113
 #, c-format
 msgid "Couldn't release channel %s!"
 msgstr "Couldn't release channel %s!"
 
-#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:357
+#: modules/core/os_akill.cpp:119 modules/core/os_akill.cpp:326
 msgid "Current AKILL list:"
 msgstr "Şu anki AKILL listesi:"
 
-#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:312
+#: modules/core/os_akill.cpp:86 modules/core/os_akill.cpp:281
 msgid ""
 "Current AKILL list:\n"
 "  Num   Mask                              Reason"
@@ -2939,15 +2294,15 @@ msgstr ""
 "Şu anki AKILL listesi:\n"
 "  No    Mask                              Sebep"
 
-#: modules/core/os_modlist.cpp:132
+#: modules/core/os_modlist.cpp:133
 msgid "Current Module list:"
 msgstr "Current Module list:"
 
-#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:372
+#: modules/core/os_snline.cpp:117 modules/core/os_snline.cpp:340
 msgid "Current SNLINE list:"
 msgstr "Şu anki SNLINE listesi:"
 
-#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:328
+#: modules/core/os_snline.cpp:85 modules/core/os_snline.cpp:296
 msgid ""
 "Current SNLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2955,11 +2310,11 @@ msgstr ""
 "Şu anki SNLINE listesi:\n"
 "  No   Mask                              Sebep"
 
-#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:352
+#: modules/core/os_sqline.cpp:116 modules/core/os_sqline.cpp:320
 msgid "Current SQLINE list:"
 msgstr "Mevcut SQLINE listesi:"
 
-#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:308
+#: modules/core/os_sqline.cpp:84 modules/core/os_sqline.cpp:276
 msgid ""
 "Current SQLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2967,11 +2322,11 @@ msgstr ""
 "Mevcut SQLINE listesi:\n"
 "  Num   Mask                              Sebep"
 
-#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:354
+#: modules/core/os_szline.cpp:116 modules/core/os_szline.cpp:322
 msgid "Current SZLINE list:"
 msgstr "Şu anki SZLINE listesi:"
 
-#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:312
+#: modules/core/os_szline.cpp:84 modules/core/os_szline.cpp:280
 msgid ""
 "Current SZLINE list:\n"
 "  Num   Mask                              Reason"
@@ -2980,7 +2335,7 @@ msgstr ""
 "  No   Mask                              Sebep"
 
 #: modules/core/os_session.cpp:73 modules/core/os_session.cpp:104
-#: modules/core/os_session.cpp:377 modules/core/os_session.cpp:411
+#: modules/core/os_session.cpp:388 modules/core/os_session.cpp:422
 msgid "Current Session Limit Exception list:"
 msgstr "Şu anki Session Limit Exception listesi:"
 
@@ -3004,56 +2359,61 @@ msgstr "Su anki SQLINE sayisi: %d"
 msgid "Current number of SZLINEs: %d"
 msgstr "Şu anki SZLINE sayısı: %d"
 
-#: modules/core/os_stats.cpp:134
+#: modules/core/os_stats.cpp:133
 #, c-format
 msgid "Current users: %d (%d ops)"
 msgstr "Şu anki kullanıcı sayısı: %d (%d op)"
 
-#: modules/core/os_defcon.cpp:127
+#: modules/core/os_defcon.cpp:135
 msgid "DEFCON [1|2|3|4|5]"
 msgstr "DEFCON [1|2|3|4|5]"
 
-#: modules/core/cs_modes.cpp:316
+#: modules/core/cs_modes.cpp:297
 #, fuzzy
 msgid "DEHALFOP [#channel] [nick]"
 msgstr "DEHALFOP #channel [nick]"
 
-#: modules/core/hs_del.cpp:56
+#: modules/core/hs_del.cpp:57
 msgid "DEL <nick>."
 msgstr "DEL <nick>."
 
-#: modules/core/ms_del.cpp:148
+#: modules/core/ms_del.cpp:149
 msgid "DEL [channel] {num | list | ALL}"
 msgstr "DEL [kanaladı] {num | liste | ALL}"
 
-#: modules/core/hs_delall.cpp:61
+#: modules/core/hs_delall.cpp:62
 msgid "DELALL <nick>."
 msgstr "DELALL <nick>."
 
-#: modules/core/cs_modes.cpp:155
+#: modules/core/cs_modes.cpp:152
 #, fuzzy
 msgid "DEOP [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:477
+#: modules/core/cs_modes.cpp:442
 #, fuzzy
 msgid "DEOWNER [#channel] [nick]"
 msgstr "DEOP #channel [nick]"
 
-#: modules/core/cs_modes.cpp:397
+#: modules/core/cs_modes.cpp:370
 #, fuzzy
 msgid "DEROTECT [#channel] [nick]"
 msgstr "DEROTECT #channel [nick]"
 
-#: modules/core/cs_modes.cpp:233
+#: modules/core/cs_modes.cpp:222
 #, fuzzy
 msgid "DEVOICE [#channel] [nick]"
 msgstr "DEVOICE #channel [nick]"
 
-#: modules/core/cs_drop.cpp:100
+#: modules/core/cs_drop.cpp:101
 msgid "DROP channel"
 msgstr "DROP kanaladı"
 
+#: modules/core/hs_off.cpp:21
+#, fuzzy
+msgid "Deactivates your assigned vhost"
+msgstr "    OFF         Deactivates your assigned vhost"
+
 #: modules/core/os_stats.cpp:47
 #, c-format
 msgid "Default AKILL expiry time: %d days"
@@ -3178,6 +2538,47 @@ msgstr "Varsayılan SZLINE zaman aşımı süresi: 1 dakika"
 msgid "Default SZLINE expiry time: No expiration"
 msgstr "Varsayılan SZLINE zaman aşımı süresi: Zaman aşımı yok"
 
+#: modules/core/os_news.cpp:369
+#, fuzzy
+msgid "Define messages to be randomly shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Bağlantı sırasında kullanıcının göreceği mesajı \n"
+"                belirler"
+
+#: modules/core/os_news.cpp:297
+#, fuzzy
+msgid "Define messages to be shown to users at logon"
+msgstr ""
+"    LOGONNEWS   Bağlantı sırasında kullanıcının göreceği mesajı \n"
+"                belirler"
+
+#: modules/core/os_news.cpp:333
+#, fuzzy
+msgid "Define messages to be shown to users who oper"
+msgstr ""
+"    OPERNEWS    Oper olan kullanıcıların görüntüleyeceği mesajı \n"
+"                belirler"
+
+#: modules/core/cs_modes.cpp:268
+#, fuzzy
+msgid "Dehalfops a selected nick on a channel"
+msgstr "    DEHALFOP   Dehalfops a selected nick on a channel"
+
+#: modules/core/ms_del.cpp:46
+#, fuzzy
+msgid "Delete a memo or memos"
+msgstr "    DEL    Mesajları silmenizi sağlar"
+
+#: modules/core/hs_delall.cpp:21
+#, fuzzy
+msgid "Delete the vhost for all nicks in a group"
+msgstr "    DELALL      Delete the vhost for all nicks in a group"
+
+#: modules/core/hs_del.cpp:21
+#, fuzzy
+msgid "Delete the vhost of another user"
+msgstr "    DEL         Delete the vhost of another user"
+
 #: modules/core/cs_xop.cpp:85
 #, fuzzy, c-format
 msgid "Deleted %d entries from %s %s list."
@@ -3188,7 +2589,7 @@ msgstr "Deleted %d entries from %s AOP list."
 msgid "Deleted %d entries from %s access list."
 msgstr "Deleted %d entries from %s access list."
 
-#: modules/core/cs_akick.cpp:150
+#: modules/core/cs_akick.cpp:149
 #, c-format
 msgid "Deleted %d entries from %s autokick list."
 msgstr "Deleted %d entries from %s autokick list."
@@ -3228,7 +2629,7 @@ msgstr "SZLINE listesinden %d kayıt silindi."
 msgid "Deleted 1 entry from %s access list."
 msgstr "%s kanalının access listesinden 1 kayıt silindi."
 
-#: modules/core/cs_akick.cpp:148
+#: modules/core/cs_akick.cpp:147
 #, c-format
 msgid "Deleted 1 entry from %s autokick list."
 msgstr "%s kanalının akick listesinden 1 kayıt silindi."
@@ -3263,32 +2664,74 @@ msgstr "SZLINE listesinden 1 kayıt silindi."
 msgid "Deleted one entry from %s %s list."
 msgstr "%s kanalinin AOP listesinden 1 kayit silindi."
 
-#: modules/core/cs_set_description.cpp:31
+#: modules/core/cs_modes.cpp:127
+#, fuzzy
+msgid "Deops a selected nick on a channel"
+msgstr "    DEOP       Deops a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:343
+#, fuzzy
+msgid "Deprotects a selected nick on a channel"
+msgstr "    DEPROTECT  Deprotects a selected nick on a channel"
+
+#: modules/core/cs_set_description.cpp:32
 #, c-format
 msgid "Description of %s changed to %s."
 msgstr "%s kanalının açıklaması %s olarak değiştirildi."
 
-#: include/language.h:109
+#: modules/core/cs_modes.cpp:196
 #, fuzzy
-msgid "Disabled"
-msgstr "Kapalı"
+msgid "Devoices a selected nick on a channel"
+msgstr "    DEVOICE    Devoices a selected nick on a channel"
+
+#: modules/core/ns_ghost.cpp:22
+#, fuzzy
+msgid "Disconnects a \"ghost\" IRC session using your nick"
+msgstr "    GHOST      Disconnects a \"ghost\" IRC session using your nick"
 
-#: modules/core/hs_list.cpp:95
+#: modules/core/os_staff.cpp:21
+#, fuzzy
+msgid "Display Services staff and online status"
+msgstr "    STAFF       Display Services staff and online status"
+
+#: modules/core/hs_list.cpp:100
 #, c-format
 msgid "Displayed all records (Count: %d)"
 msgstr "Displayed all records (Count: %d)"
 
-#: modules/core/hs_list.cpp:93
+#: modules/core/hs_list.cpp:98
 #, c-format
 msgid "Displayed records from %d to %d"
 msgstr "Displayed records from %d to %d"
 
-#: modules/core/hs_list.cpp:89
+#: modules/core/hs_list.cpp:94
 #, c-format
 msgid "Displayed records matching key %s (Count: %d)"
 msgstr "Displayed records matching key %s (Count: %d)"
 
-#: modules/core/bs_kick.cpp:570
+#: modules/core/ns_info.cpp:34
+#, fuzzy
+msgid "Displays information about a given nickname"
+msgstr "    INFO       Displays information about a given nickname"
+
+#: modules/core/ms_info.cpp:21
+#, fuzzy
+msgid "Displays information about your memos"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/hs_list.cpp:21
+#, fuzzy
+msgid "Displays one or more vhost entries."
+msgstr "    LIST        Displays one or more vhost entries."
+
+#: modules/core/ns_help.cpp:22 modules/core/os_help.cpp:21
+#: modules/core/bs_help.cpp:23 modules/core/cs_help.cpp:23
+#: modules/core/hs_help.cpp:22 modules/core/ms_help.cpp:22
+#, fuzzy
+msgid "Displays this list and give information about commands"
+msgstr "    INFO   Displays information about your memos"
+
+#: modules/core/bs_kick.cpp:612
 msgid "Don't use AMSGs!"
 msgstr ""
 
@@ -3317,169 +2760,210 @@ msgstr "%s kelimesinin bu kanalda kullanılması yasaktır!"
 msgid "Don't use underlines on this channel!"
 msgstr "Lütfen bu kanalda altı çizili yazı kullanmayın!"
 
-#: modules/core/ns_set_email.cpp:52
+#: modules/core/ns_set_email.cpp:92
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/core/ns_set_email.cpp:57
+#: modules/core/ns_set_email.cpp:97
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
 
-#: src/mail.cpp:50 src/mail.cpp:71
+#: src/mail.cpp:50
 #, c-format
 msgid "E-mail for %s is invalid."
 msgstr "%s için mail adresi geçerli değil."
 
-#: modules/core/os_session.cpp:498
+#: modules/core/os_session.cpp:511
 msgid "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [params]"
 msgstr "EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [parametreler]"
 
-#: modules/core/ns_getemail.cpp:42
+#: modules/core/ns_set_email.cpp:31
+msgid "Email confirmation"
+msgstr ""
+
+#: modules/core/ns_getemail.cpp:43
 #, c-format
 msgid "Emails Match %s to %s."
 msgstr "Emails Match %s to %s."
 
-#: include/language.h:108
-#, fuzzy
-msgid "Enabled"
-msgstr "Aktif"
-
-#: include/language.h:39
-#, c-format
-msgid "End of %s list."
-msgstr "End of %s list."
-
-#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:315
-#: modules/core/cs_access.cpp:357
+#: modules/core/cs_access.cpp:29 modules/core/cs_access.cpp:321
+#: modules/core/cs_access.cpp:363
 msgid "End of access list."
 msgstr "access listenin sonu."
 
-#: modules/core/os_chanlist.cpp:73
+#: modules/core/os_chanlist.cpp:74
 msgid "End of channel list."
 msgstr "Kanal listesi sonu."
 
-#: modules/core/ns_alist.cpp:122
+#: modules/core/os_config.cpp:189
+msgid "End of configuration."
+msgstr ""
+
+#: modules/core/ns_alist.cpp:129
 #, c-format
 msgid "End of list - %d/%d channels shown."
 msgstr "Liste sonu - %d/%d ."
 
-#: modules/core/ns_list.cpp:170 modules/core/cs_list.cpp:120
+#: modules/core/ns_list.cpp:147 modules/core/cs_list.cpp:119
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Liste sonu - %d/%d ."
 
-#: modules/core/os_userlist.cpp:73
+#: modules/core/os_userlist.cpp:74
 msgid "End of users list."
 msgstr "Kullanıcı listesi sonu."
 
-#: modules/core/ns_set_language.cpp:64
+#: modules/core/ns_set_language.cpp:65
 msgid "English"
 msgstr "Türkçe"
 
-#: include/language.h:116
-#, c-format
-msgid ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
+#: modules/core/os_config.cpp:144
+msgid "Error changing configuration value: "
 msgstr ""
-"Error! The Ident is too long, please use an ident shorter than %d characters."
 
-#: include/language.h:115
-#, c-format
+#: modules/core/os_reload.cpp:37
+#, fuzzy
+msgid "Error reloading confguration file: "
+msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
+
+#: modules/core/ns_cert.cpp:165
 msgid ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
+"Examples:\n"
+" \n"
+"    CERT ADD <fingerprint>\n"
+"        Adds this fingerprint to the certificate list and\n"
+"        automatically identifies you when you connect to IRC\n"
+"        using this certificate.\n"
+" \n"
+"    CERT DEL <fingerprint>\n"
+"        Reverses the previous command.\n"
+" \n"
+"    CERT LIST\n"
+"        Displays the current certificate list."
 msgstr ""
-"Error! The vhost is too long, please use a host shorter than %d characters."
 
-#: modules/core/os_session.cpp:346
+#: modules/core/os_session.cpp:357
 #, c-format
 msgid "Exception for %s (#%d) moved to position %d."
 msgstr "%s (#%d) için exception %d pozisyonuyla değiştirildi."
 
-#: src/sessions.cpp:260
+#: src/sessions.cpp:261
 #, c-format
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/core/ns_info.cpp:141
+#: modules/core/ns_info.cpp:137 modules/core/ns_info.cpp:140
 #, c-format
 msgid "Expires on: %s"
 msgstr "Expires in: %s"
 
-#: src/operserv.cpp:510 src/operserv.cpp:578 src/operserv.cpp:688
-#: src/operserv.cpp:813
+#: src/operserv.cpp:502 src/operserv.cpp:572 src/operserv.cpp:684
+#: src/operserv.cpp:811
 #, c-format
 msgid "Expiry time of %s changed."
 msgstr "%s nickinin zaman aşımı süresi değiştirildi."
 
-#: modules/core/cs_forbid.cpp:34
+#: modules/core/cs_forbid.cpp:35
 msgid "FORBID channel reason"
 msgstr "FORBID kanaladı sebep"
 
-#: modules/core/cs_forbid.cpp:111
+#: modules/core/cs_forbid.cpp:110
 msgid "FORBID channel [reason]"
 msgstr "FORBID kanaladı [sebep]"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname reason"
 msgstr "FORBID nick sebep"
 
-#: modules/core/ns_forbid.cpp:100
+#: modules/core/ns_forbid.cpp:98
 msgid "FORBID nickname [reason]"
 msgstr "FORBID nick [sebep]"
 
-#: modules/core/bs_info.cpp:196
+#: modules/core/bs_info.cpp:197
 msgid "Fantasy"
 msgstr "Fantazi"
 
-#: modules/core/bs_set.cpp:103 modules/core/bs_set.cpp:108
+#: modules/core/bs_set.cpp:109
 #, fuzzy, c-format
-msgid "Fantasy mode is now  on channel %s."
+msgid "Fantasy mode is now off on channel %s."
 msgstr "Fantazi modu %s kanalında AKTİF."
 
-#: modules/core/bs_set.cpp:181
+#: modules/core/bs_set.cpp:104
+#, fuzzy, c-format
+msgid "Fantasy mode is now on on channel %s."
+msgstr "Fantazi modu %s kanalında AKTİF."
+
+#: modules/core/bs_set.cpp:182
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:188
+#: modules/core/bs_set.cpp:189
 #, c-format
 msgid "Fantasy replies will be sent via NOTICE to channel ops on %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:174
+#: modules/core/bs_set.cpp:175
 #, c-format
 msgid "Fantasy replies will be sent via PRIVMSG to %s."
 msgstr ""
 
-#: modules/core/bs_set.cpp:167
+#: modules/core/bs_set.cpp:168
 #, fuzzy, c-format
 msgid "Fantasy replies will no longer be sent to %s."
 msgstr "%s will no longer be ignored."
 
-#: modules/core/cs_set_founder.cpp:67
+#: modules/core/ns_cert.cpp:67
+#, fuzzy, c-format
+msgid "Fingerprint %s already present on your certificate list."
+msgstr "%s access listenizde zaten var."
+
+#: modules/core/os_update.cpp:21
+#, fuzzy
+msgid "Force the Services databases to be updated immediately"
+msgstr ""
+"    UPDATE      Diskteki Servis veritabanının hemen\n"
+"                güncellenmesini sağlar"
+
+#: modules/core/os_svsnick.cpp:21
+#, fuzzy
+msgid "Forcefully change a user's nickname"
+msgstr "    SVSNICK     Forcefully change a user's nickname"
+
+#: modules/core/cs_saset.cpp:24
+#, fuzzy
+msgid "Forcefully set channel options and information"
+msgstr "    SASET      Forcefully set channel options and information"
+
+#: modules/core/ns_sendpass.cpp:24
+#, fuzzy
+msgid "Forgot your password? Try this"
+msgstr "    SENDPASS   Şifrenizimi unuttunuz? Bunu deneyin"
+
+#: modules/core/cs_set_founder.cpp:68
 #, c-format
 msgid "Founder of %s changed to %s."
 msgstr "%s kanalının founderı %s olarak değiştirildi."
 
-#: modules/core/ns_getemail.cpp:67
+#: modules/core/ns_getemail.cpp:68
 msgid "GETEMAIL user@email-host No WildCards!!"
 msgstr "GETEMAIL user@email-host No WildCards!!"
 
-#: modules/core/cs_getkey.cpp:60
+#: modules/core/cs_getkey.cpp:61
 msgid "GETKEY channel"
 msgstr "GETKEY channel"
 
-#: modules/core/ns_getpass.cpp:75
+#: modules/core/ns_getpass.cpp:63
 msgid "GETPASS nickname"
 msgstr "GETPASS nick"
 
-#: modules/core/ns_getpass.cpp:57
+#: modules/core/ns_getpass.cpp:45
 msgid "GETPASS command unavailable because encryption is in use."
 msgstr "GETPASS komutu devre dışı çünkü şifreleme(encryption) devrede."
 
-#: modules/core/ns_ghost.cpp:91
+#: modules/core/ns_ghost.cpp:93
 msgid "GHOST nickname [password]"
 msgstr "GHOST nick [şifre]"
 
@@ -3487,11 +2971,26 @@ msgstr "GHOST nick [şifre]"
 msgid "GLOBAL message"
 msgstr "GLOBAL mesaj"
 
-#: modules/core/ns_ghost.cpp:53
+#: modules/core/ns_ghost.cpp:55
 msgid "Ghost with your nick has been killed."
 msgstr "Asılı kalan nickiniz kill lendi."
 
-#: modules/core/bs_info.cpp:201
+#: modules/core/os_oline.cpp:21
+#, fuzzy
+msgid "Give Operflags to a certain user"
+msgstr "    OLINE       Give Operflags to a certain user"
+
+#: modules/core/cs_modes.cpp:93
+#, fuzzy
+msgid "Gives Op status to a selected nick on a channel"
+msgstr "    OP         Gives Op status to a selected nick on a channel"
+
+#: modules/core/cs_modes.cpp:379
+#, fuzzy
+msgid "Gives you owner status on channel"
+msgstr "    OWNER      Gives you owner status on channel"
+
+#: modules/core/bs_info.cpp:202
 msgid "Greet"
 msgstr "Karşılama"
 
@@ -3499,78 +2998,156 @@ msgstr "Karşılama"
 msgid "Greet message displayed"
 msgstr "Karşılama mesajı alabilir."
 
-#: modules/core/ns_set_greet.cpp:35
+#: modules/core/ns_set_greet.cpp:36
 #, c-format
 msgid "Greet message for %s changed to %s."
 msgstr "Greet message for %s changed to %s."
 
-#: modules/core/ns_set_greet.cpp:40
+#: modules/core/ns_set_greet.cpp:41
 #, c-format
 msgid "Greet message for %s unset."
 msgstr "Greet message for %s unset."
 
-#: modules/core/bs_set.cpp:118 modules/core/bs_set.cpp:123
+#: modules/core/bs_set.cpp:124
+#, fuzzy, c-format
+msgid "Greet mode is now off on channel %s."
+msgstr "Karşılama modu %s kanalında AKTİF."
+
+#: modules/core/bs_set.cpp:119
 #, fuzzy, c-format
-msgid "Greet mode is now  on channel %s."
+msgid "Greet mode is now on on channel %s."
 msgstr "Karşılama modu %s kanalında AKTİF."
 
-#: modules/core/cs_modes.cpp:274
+#: modules/core/cs_modes.cpp:259
 #, fuzzy
 msgid "HALFOP [#channel] [nick]"
 msgstr "HALFOP #channel [nick]"
 
-#: modules/core/cs_xop.cpp:589
+#: modules/core/cs_xop.cpp:581
 msgid "HOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "HOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/core/os_stats.cpp:220
+#: modules/core/cs_modes.cpp:231
+#, fuzzy
+msgid "Halfops a selected nick on a channel"
+msgstr "    HALFOP     Halfops a selected nick on a channel"
+
+#: modules/core/ns_resetpass.cpp:24
+#, fuzzy
+msgid "Helps you reset lost passwords"
+msgstr "    RESETPASS  Helps you reset lost passwords"
+
+#: modules/core/ns_set_email.cpp:32
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to change your email address to %s.\n"
+"Please type \" %s%s confirm %s \" to confirm this change.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_register.cpp:354
+#, fuzzy, c-format
+msgid ""
+"Hi,\n"
+" \n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" %s%s confirm %s \" to complete registration.\n"
+" \n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+" \n"
+"%s administrators."
+msgstr ""
+"Hi,\n"
+"\n"
+"You have requested to register the nickname %s on %s.\n"
+"Please type \" /msg %s confirm %s \" to complete registration.\n"
+"\n"
+"If you don't know why this mail was sent to you, please ignore it silently.\n"
+"\n"
+"%s administrators."
+
+#: modules/core/ns_set_hide.cpp:21
+#, fuzzy
+msgid "Hide certain pieces of nickname information"
+msgstr "    HIDE       Nickinizle ilgili bazı bilgileri saklar"
+
+#: modules/core/cs_set_private.cpp:21
+#, fuzzy
+msgid "Hide channel from LIST command"
+msgstr "    PRIVATE       LIST komutuyla kanal listelenmez"
+
+#: modules/core/os_stats.cpp:182
 #, c-format
 msgid "HostServ      : %6d records, %5d kB"
 msgstr "HostServ      : %6d records, %5d kB"
 
-#: modules/core/os_session.cpp:134
+#: modules/core/os_session.cpp:139
 #, c-format
 msgid "Hosts with at least %d sessions:"
 msgstr "En az %d sessionlı hostlar:"
 
-#: modules/core/ns_identify.cpp:119
+#: modules/core/ns_identify.cpp:84
 msgid "IDENTIFY [account] password"
 msgstr "IDENTIFY şifreniz"
 
-#: modules/core/ms_ignore.cpp:99
+#: modules/core/ms_ignore.cpp:100
 #, fuzzy
 msgid "IGNORE [channel] {ADD|DEL|} [entry]"
 msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/core/os_ignore.cpp:279
+#: modules/core/os_ignore.cpp:280
 #, fuzzy
 msgid "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]"
 msgstr "IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick | mask]"
 
-#: modules/core/cs_info.cpp:130
+#: modules/core/cs_info.cpp:129
 msgid "INFO channel"
 msgstr "INFO kanaladı"
 
-#: modules/core/ns_info.cpp:162
+#: modules/core/ns_info.cpp:164
 msgid "INFO nick"
 msgstr "INFO nick"
 
-#: modules/core/bs_info.cpp:235
+#: modules/core/bs_info.cpp:236
 msgid "INFO {chan | nick}"
 msgstr "INFO {kanaladı | nick}"
 
-#: modules/core/cs_invite.cpp:84
+#: modules/core/cs_invite.cpp:85
 msgid "INVITE channel"
 msgstr "INVITE kanaladı"
 
-#: src/nickserv.cpp:226
+#: modules/core/ns_identify.cpp:22
+#, fuzzy
+msgid "Identify yourself with your password"
+msgstr "    IDENTIFY   Şifrenizle nickinizi tanıtır"
+
+#: src/nickserv.cpp:225
 msgid "If you do not change within 20 seconds, I will change your nick."
 msgstr "Eğer 20 saniye içinde nickinizi değiştirmezseniz, Ben değiştireceğim."
 
-#: src/nickserv.cpp:231
+#: src/nickserv.cpp:230
 msgid "If you do not change within one minute, I will change your nick."
 msgstr "Eğer bir dakika içinde nickinizi değiştirmezseniz, Ben değiştireceğim."
 
+#: modules/core/ns_register.cpp:203
+#, c-format
+msgid ""
+"If you do not confirm your email address within %s your account will expire."
+msgstr ""
+
 #: modules/core/os_ignore.cpp:230
 msgid "Ignore list has been cleared."
 msgstr "Ignore list has been cleared."
@@ -3579,12 +3156,13 @@ msgstr "Ignore list has been cleared."
 msgid "Ignore list is empty."
 msgstr "Ignore listesi boş."
 
-#: modules/core/ms_ignore.cpp:77
+#: modules/core/ms_ignore.cpp:78
 #, fuzzy
 msgid "Ignore list:"
 msgstr "Bot listesi:"
 
-#: modules/core/ns_set.cpp:76
+#: modules/core/ns_set.cpp:77
+#, fuzzy, c-format
 msgid ""
 "In order to use this command, you must first identify\n"
 "with your password (%s%s HELP IDENTIFY for more\n"
@@ -3600,38 +3178,28 @@ msgstr ""
 "Belirli bir özellik(option) hakkında bilgi almak için\n"
 "/msg %s HELP SET option yazın."
 
-#: include/language.h:40
-msgid "Incorrect range specified. The correct syntax is #from-to."
-msgstr "Incorrect range specified. The correct syntax is #from-to."
+#: modules/core/os_modinfo.cpp:43
+#, fuzzy
+msgid "Info about a loaded module"
+msgstr "    MODINFO     Info about a loaded module"
 
-#: modules/core/bs_info.cpp:60
+#: modules/core/bs_info.cpp:61
 #, c-format
 msgid "Information for bot %s:"
 msgstr "%s botunun bilgileri:"
 
-#: include/language.h:89
-#, c-format
-msgid "Information for channel %s:"
-msgstr "%s kanalı için bilgi:"
-
-#: include/language.h:13
-msgid "Invalid expiry time."
-msgstr "Geçersiz zaman aşımı süresi."
-
-#: modules/core/os_session.cpp:274
+#: modules/core/os_session.cpp:280
 msgid ""
 "Invalid hostmask. Only real hostmasks are valid as exceptions are not "
 "matched against nicks or usernames."
 msgstr ""
 "Geçersiz hostmask. Sadece gerçek hostmasklar exception olarak geçerlidir."
 
-#: include/language.h:68
-msgid ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
+#: modules/core/ns_register.cpp:56 modules/core/ns_register.cpp:59
+msgid "Invalid passcode."
 msgstr ""
-"Invalid passcode has been entered, please check the e-mail again, and retry"
 
-#: modules/core/os_session.cpp:267
+#: modules/core/os_session.cpp:273
 #, c-format
 msgid ""
 "Invalid session limit. It must be a valid integer greater than or equal to "
@@ -3640,7 +3208,7 @@ msgstr ""
 "Geçersiz session limiti. Sıfırdan büyük yada eşit ve %d den az bir geçerli "
 "tamsayı olmalıdır."
 
-#: modules/core/os_session.cpp:131
+#: modules/core/os_session.cpp:136
 msgid "Invalid threshold value. It must be a valid integer greater than 1."
 msgstr "Geçersiz threshold değeri. 1 den büyük geçerli tamsayı olmalıdır."
 
@@ -3648,12 +3216,17 @@ msgstr "Geçersiz threshold değeri. 1 den büyük geçerli tamsayı olmalıdır."
 msgid "JUPE servername [reason]"
 msgstr "JUPE serverismi [sebep]"
 
-#: modules/core/cs_kick.cpp:76
+#: modules/core/ns_group.cpp:22
+#, fuzzy
+msgid "Join a group"
+msgstr "    GROUP      Bir gruba dahil eder"
+
+#: modules/core/cs_kick.cpp:77
 msgid "KICK #channel nick [reason]"
 msgstr "KICK #channel nick [reason]"
 
-#: modules/core/bs_kick.cpp:37 modules/core/bs_kick.cpp:39
-#: modules/core/bs_kick.cpp:529
+#: modules/core/bs_kick.cpp:38 modules/core/bs_kick.cpp:40
+#: modules/core/bs_kick.cpp:576
 #, fuzzy
 msgid "KICK channel option {ON|} [settings]"
 msgstr "KICK kanaladı özellik {ON|OFF} [ayarlar]"
@@ -3662,263 +3235,446 @@ msgstr "KICK kanaladı özellik {ON|OFF} [ayarlar]"
 msgid "KICK channel user reason"
 msgstr "KICK kanaladı kullanıcı sebep"
 
-#: modules/core/cs_getkey.cpp:46
+#: modules/core/cs_getkey.cpp:47
 #, c-format
 msgid "Key for channel %s is %s."
 msgstr "Key for channel %s is %s."
 
-#: modules/core/cs_access.cpp:741
+#: modules/core/os_kick.cpp:21
+#, fuzzy
+msgid "Kick a user from a channel"
+msgstr "    KICK        Bir kullanıcıyı kanaldan atar"
+
+#: modules/core/cs_kick.cpp:21
+#, fuzzy
+msgid "Kicks a selected nick from a channel"
+msgstr "    KICK       Kicks a selected nick from a channel"
+
+#: modules/core/ns_recover.cpp:22
+#, fuzzy
+msgid "Kill another user who has taken your nick"
+msgstr "    RECOVER    Nickinizi kullanan birini kill ler"
+
+#: modules/core/cs_access.cpp:755
 msgid "LEVELS channel {SET | DIS[ABLE] | LIST | RESET} [item [level]]"
 msgstr "LEVELS kanaladı {SET | DIS[ABLE] | LIST | RESET} [madde [seviye]]"
 
-#: include/language.h:62
-msgid "LIST pattern"
-msgstr "LIST model"
-
-#: modules/core/ns_list.cpp:229
+#: modules/core/ns_list.cpp:206
 msgid "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgstr "LIST model [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 
-#: modules/core/ms_list.cpp:160
+#: modules/core/ms_list.cpp:161
 msgid "LIST [channel] [list | NEW]"
 msgstr "LIST [kanaladı] [liste | NEW]"
 
-#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:43
-#: modules/core/os_news.cpp:319
+#: modules/core/os_login.cpp:64
+#, fuzzy
+msgid "LOGIN password"
+msgstr "GROUP hedef şifre"
+
+#: modules/core/os_news.cpp:36 modules/core/os_news.cpp:324
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [yazı|num]"
 
-#: modules/core/ns_logout.cpp:90
+#: modules/core/ns_logout.cpp:91
 msgid "LOGOUT"
 msgstr "LOGOUT"
 
-#: modules/core/ns_set_language.cpp:46
+#: modules/core/ns_set_language.cpp:47
 msgid "Language changed to English."
 msgstr "Dil Türkçe olarak değiştirildi."
 
-#: modules/core/ms_cancel.cpp:48
+#: modules/core/ms_cancel.cpp:49
 #, c-format
 msgid "Last memo to %s has been cancelled."
 msgstr "%s nickine gönderilen son mesaj iptal edildi."
 
-#: modules/core/ns_info.cpp:103
+#: modules/core/ns_info.cpp:97
 #, c-format
 msgid "Last quit message: %s"
 msgstr "      Son çıkış mesajı: %s"
 
-#: modules/core/ns_info.cpp:92
+#: modules/core/ns_info.cpp:86
 #, c-format
 msgid "Last seen address: %s"
 msgstr "      Son görüldüğü adres: %s"
 
-#: modules/core/cs_access.cpp:568
+#: modules/core/cs_access.cpp:581
 #, c-format
 msgid "Level for %s on channel %s changed to %d."
 msgstr "%s için level %s kanalında %d olarak değiştirildi."
 
-#: modules/core/cs_access.cpp:566
+#: modules/core/cs_access.cpp:579
 #, c-format
 msgid "Level for %s on channel %s changed to founder only."
 msgstr "Level for %s on channel %s changed to founder only."
 
-#: modules/core/cs_access.cpp:552
+#: modules/core/cs_access.cpp:565
 #, c-format
 msgid "Level must be between %d and %d inclusive."
 msgstr "Level %d ile %d arasında olmalıdır."
 
-#: modules/core/cs_access.cpp:676
+#: modules/core/cs_access.cpp:690
 msgid "Levels are not available as xOP is enabled on this channel."
 msgstr "Bu modda bu komut kullanilmaz."
 
-#: include/language.h:63
-#, c-format
-msgid "List of entries matching %s:"
-msgstr "%s içeren kayıtların listesi:"
+#: modules/core/ns_list.cpp:22
+#, fuzzy
+msgid "List all registered nicknames that match a given pattern"
+msgstr ""
+"    LIST       List all registered nicknames that match a given pattern"
+
+#: modules/core/ns_alist.cpp:21
+#, fuzzy
+msgid "List channels you have access on"
+msgstr "    ALIST      List channels you have access on"
+
+#: modules/core/os_modlist.cpp:21
+#, fuzzy
+msgid "List loaded modules"
+msgstr "    MODLIST     List loaded modules"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s grubundaki nicklerin listesi:"
 
-#: modules/core/ns_group.cpp:271
+#: modules/core/ns_group.cpp:268
 msgid "List of nicknames in your group:"
 msgstr "Grubunuzdaki nicklerin listesi:"
 
-#: modules/core/cs_register.cpp:40
+#: modules/core/ms_list.cpp:58
+#, fuzzy
+msgid "List your memos"
+msgstr "    LIST   Mesajlarınızı listeler"
+
+#: modules/core/os_chanlist.cpp:21
+#, fuzzy
+msgid "Lists all channel records"
+msgstr "    CHANLIST    Tüm kanal kayıtlarını listeler"
+
+#: modules/core/ns_group.cpp:252
+#, fuzzy
+msgid "Lists all nicknames in your group"
+msgstr "Grubunuzdaki nicklerin listesi:"
+
+#: modules/core/cs_list.cpp:23
+#, fuzzy
+msgid "Lists all registered channels matching the given pattern"
+msgstr ""
+"    LIST       Lists all registered channels matching the given pattern"
+
+#: modules/core/os_userlist.cpp:21
+#, fuzzy
+msgid "Lists all user records"
+msgstr "    USERLIST    Tüm kullanıcı kayıtlarını listeler"
+
+#: modules/core/bs_botlist.cpp:21
+#, fuzzy
+msgid "Lists available bots"
+msgstr "BOTLIST            Mevcut botları listeler"
+
+#: modules/core/cs_info.cpp:35
+#, fuzzy
+msgid "Lists information about the named registered channel"
+msgstr "    INFO       Lists information about the named registered channel"
+
+#: modules/core/os_modload.cpp:21
+#, fuzzy
+msgid "Load a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/cs_register.cpp:39
 msgid "Local channels cannot be registered."
 msgstr "Local kanallar kayıt edilemezler."
 
-#: modules/core/os_news.cpp:42
+#: modules/core/os_login.cpp:22
+#, c-format
+msgid "Login to %s"
+msgstr ""
+
+#: modules/core/os_news.cpp:43
 #, c-format
-msgid "Logon news item #%d not found!"
+msgid "Logon news item #%d deleted."
+msgstr "Bağlantı haberleri maddesi #%d silindi."
+
+#: modules/core/os_news.cpp:42
+#, fuzzy, c-format
+msgid "Logon news item #%s not found!"
 msgstr "Bağlantı haberleri maddesi #%d bulunamadı!"
 
 #: modules/core/os_news.cpp:37
 msgid "Logon news items:"
 msgstr "Bağlantı haberleri:"
 
-#: include/language.h:79
-msgid "MLOCK is deprecated. Use %s%s HELP MODE instead."
+#: modules/core/cs_mode.cpp:355
+msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
 msgstr ""
 
-#: modules/core/os_mode.cpp:56
-msgid "MODE channel modes"
+#: modules/core/os_mode.cpp:75
+#, fuzzy
+msgid "MODE {channel|user} modes"
 msgstr "MODE kanaladı modlar"
 
-#: modules/core/cs_mode.cpp:307
-msgid "MODE channel {LOCK|SET} [modes | {ADD|DEL|LIST} [what]]"
-msgstr ""
-
-#: modules/core/os_modinfo.cpp:77
+#: modules/core/os_modinfo.cpp:78
 msgid "MODINFO FileName"
 msgstr "MODINFO FileName"
 
-#: modules/core/os_modload.cpp:65
+#: modules/core/os_modload.cpp:66
 msgid "MODLOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modreload.cpp:91
+#: modules/core/os_modreload.cpp:92
 #, fuzzy
 msgid "MODRELOAD FileName"
 msgstr "MODLOAD FileName"
 
-#: modules/core/os_modunload.cpp:73
+#: modules/core/os_modunload.cpp:74
 msgid "MODUNLOAD FileName"
 msgstr "MODUNLOAD FileName"
 
+#: modules/core/cs_akick.cpp:477
+#, fuzzy
+msgid "Maintain the AutoKick list"
+msgstr "    AKICK      Autokick listesini düzenler"
+
+#: modules/core/bs_badwords.cpp:231
+#, fuzzy
+msgid "Maintains bad words list"
+msgstr "BADWORDS           Küfür listesi oluşturur"
+
+#: modules/core/bs_bot.cpp:307
+#, fuzzy
+msgid "Maintains network bot list"
+msgstr "BOT                Networkün bot listesini düzenler"
+
+#: modules/core/cs_xop.cpp:530
+#, fuzzy
+msgid "Maintains the HOP (HalfOP) list for a channel"
+msgstr "    HOP        Maintains the HOP (HalfOP) list for a channel"
+
+#: modules/core/cs_xop.cpp:652
+#, fuzzy
+msgid "Maintains the VOP (VOicePeople) list for a channel"
+msgstr "    VOP        Maintains the VOP (VOicePeople) list for a channel"
+
+#: modules/core/bs_act.cpp:21
+#, fuzzy
+msgid "Makes the bot do the equivalent of a \"/me\" command"
+msgstr ""
+"ACT                Makes the bot do the equivalent of a \"/me\" command"
+
+#: modules/core/bs_say.cpp:21
+#, fuzzy
+msgid "Makes the bot say the given text on the given channel"
+msgstr ""
+"SAY                Makes the bot say the given text on the given channel"
+
+#: modules/core/ns_ajoin.cpp:76
+#, fuzzy
+msgid "Manage your auto join list"
+msgstr "    AKICK      Autokick listesini düzenler"
+
+#: modules/core/ms_ignore.cpp:21
+#, fuzzy
+msgid "Manage your memo ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/os_akill.cpp:352
+#, fuzzy
+msgid "Manipulate the AKILL list"
+msgstr "    AKILL       AKILL listesini düzenler"
+
+#: modules/core/os_defcon.cpp:60
+#, fuzzy
+msgid "Manipulate the DefCon system"
+msgstr "    DEFCON      Manipulate the DefCon system"
+
+#: modules/core/os_snline.cpp:366
+#, fuzzy
+msgid "Manipulate the SNLINE list"
+msgstr "    SNLINE      SNLINE listesini düzenler"
+
+#: modules/core/os_sqline.cpp:346
+#, fuzzy
+msgid "Manipulate the SQLINE list"
+msgstr "    SQLINE      SQLINE listesini düzenler"
+
+#: modules/core/os_szline.cpp:348
+#, fuzzy
+msgid "Manipulate the SZLINE list"
+msgstr "    SZLINE      SZLINE listesini düzenler"
+
+#: modules/core/cs_topic.cpp:21
+#, fuzzy
+msgid "Manipulate the topic of the specified channel"
+msgstr "    TOPIC      Manipulate the topic of the specified channel"
+
 #: modules/core/ns_access.cpp:65
 #, c-format
 msgid "Mask %s already present on your access list."
 msgstr "%s access listenizde zaten var."
 
-#: include/language.h:12
-msgid "Mask must be in the form user@host."
-msgstr "Mask user@host şeklinde tanımlanmalıdır."
+#: modules/core/ns_getemail.cpp:25
+#, fuzzy
+msgid "Matches and returns all users that registered using given email"
+msgstr ""
+"    GETEMAIL   Matches and returns all users that registered using given "
+"email"
 
-#: modules/core/os_stats.cpp:135
+#: modules/core/os_stats.cpp:134
 #, c-format
 msgid "Maximum users: %d (%s)"
 msgstr "Maximum kullanıcı sayısı: %d (%s)"
 
 #: modules/core/ms_read.cpp:39
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %d"
 msgstr "%d nolu mesaj %s nickinden (%s).  Silmek için: /msg %s DEL %d yazın."
 
 #: modules/core/ms_read.cpp:37
+#, fuzzy, c-format
 msgid "Memo %d from %s (%s).  To delete, type: %s%s DEL %s %d"
 msgstr ""
 "%d nolu mesaj %s nickinden (%s).  Silmek için: /msg %s DEL %s %d yazın."
 
-#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:104
+#: modules/core/ms_del.cpp:37 modules/core/ms_del.cpp:105
 #, c-format
 msgid "Memo %d has been deleted."
 msgstr "%d nolu mesaj silindi."
 
-#: modules/core/ms_set.cpp:199
+#: modules/core/ms_set.cpp:197
 #, c-format
 msgid "Memo limit disabled for %s."
 msgstr "%s nickinin mesaj limiti kapatıldı."
 
-#: modules/core/ms_set.cpp:185
+#: modules/core/ms_set.cpp:183
 #, c-format
 msgid "Memo limit for %s set to %d."
 msgstr "%s nickinin mesaj limiti %d olarak ayarlandı."
 
-#: modules/core/ms_set.cpp:192
+#: modules/core/ms_set.cpp:190
 #, c-format
 msgid "Memo limit for %s set to 0."
 msgstr "%s nickinin mesaj limiti 0 olarak ayarlandı."
 
-#: modules/core/ms_set.cpp:139 modules/core/ms_set.cpp:175
-#, c-format
-msgid "Memo limit too large; limiting to %d instead."
-msgstr "Mesaj limiti çok fazla; limit %d olarak değiştiriliyor."
-
 #: src/memoserv.cpp:219
 #, c-format
 msgid "Memo sent to %s."
 msgstr "%s nickine mesajınız gönderildi."
 
-#: modules/core/ms_list.cpp:38
-msgid "Memos for %s.  To read, type: %s%s READ num"
+#: modules/core/ms_list.cpp:38 modules/core/ms_list.cpp:135
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ num"
 msgstr "%s nicki için mesajlar.  Okumak için: /msg %s READ num yazın."
 
 #: modules/core/ms_list.cpp:36
-msgid "Memos for %s.  To read, type: %s%s READ %s num"
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %s%s READ %s num"
 msgstr "%s kanali için mesajlar.  Okumak için: /msg %s READ %s num yazın."
 
-#: modules/core/ms_list.cpp:134
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ num"
-msgstr "%s nicki için mesajlar.  Okumak için: /msg %s READ num yazın."
-
-#: modules/core/ms_list.cpp:132
-#, fuzzy
-msgid "Memos for %s. To read, type: %s%s READ %s num"
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
+msgid "Memos for %s. To read, type: %sR%s READ %s num"
 msgstr "%s kanali için mesajlar.  Okumak için: /msg %s READ %s num yazın."
 
-#: modules/core/ns_info.cpp:125
+#: modules/core/ns_info.cpp:119
 msgid "Message mode"
 msgstr "Message mode"
 
-#: modules/core/cs_mode.cpp:54 modules/core/cs_mode.cpp:97
+#: modules/core/cs_mode.cpp:75 modules/core/cs_mode.cpp:118
 #, c-format
 msgid "Missing parameter for mode %c."
 msgstr ""
 
-#: modules/core/cs_mode.cpp:121
+#: modules/core/cs_mode.cpp:142
 #, fuzzy, c-format
 msgid "Mode locks for %s:"
 msgstr "     Mod kilidi: %s"
 
-#: modules/core/os_modload.cpp:31
+#: modules/core/os_ignore.cpp:238
+#, fuzzy
+msgid "Modify the Services ignore list"
+msgstr "    IGNORE      Modify the Services ignore list"
+
+#: modules/core/cs_xop.cpp:468
+#, fuzzy
+msgid "Modify the list of AOP users"
+msgstr "    AOP        AOP listesini düzenler"
+
+#: modules/core/cs_xop.cpp:406
+#, fuzzy
+msgid "Modify the list of QOP users"
+msgstr "    QOP        Modify the list of QOP users"
+
+#: modules/core/cs_xop.cpp:590
+#, fuzzy
+msgid "Modify the list of SOP users"
+msgstr "    SOP        SOP listesini düzenler"
+
+#: modules/core/ns_access.cpp:120
+#, fuzzy
+msgid "Modify the list of authorized addresses"
+msgstr "    ACCESS     İzinli adreslerin listesini düzenler"
+
+#: modules/core/cs_access.cpp:396
+#, fuzzy
+msgid "Modify the list of privileged users"
+msgstr "    ACCESS     Ayrıcalıklı kullanıcıları belirler değiştirir"
+
+#: modules/core/os_session.cpp:437
+#, fuzzy
+msgid "Modify the session-limit exception list"
+msgstr "    EXCEPTION   Session-limit exception listesini düzenler"
+
+#: modules/core/os_modload.cpp:32
 #, c-format
 msgid "Module %s is already loaded."
 msgstr "Module %s is already loaded."
 
-#: modules/core/os_modunload.cpp:31 modules/core/os_modreload.cpp:31
+#: modules/core/os_modunload.cpp:32 modules/core/os_modreload.cpp:32
 #, c-format
 msgid "Module %s isn't loaded."
 msgstr "Module %s isn't loaded."
 
-#: modules/core/os_modload.cpp:39
+#: modules/core/os_modload.cpp:40
 #, c-format
 msgid "Module %s loaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modreload.cpp:61
+#: modules/core/os_modreload.cpp:62
 #, fuzzy, c-format
 msgid "Module %s reloaded"
 msgstr "Module %s loaded"
 
-#: modules/core/os_modunload.cpp:53
+#: modules/core/os_modunload.cpp:54
 #, c-format
 msgid "Module %s unloaded"
 msgstr "Module %s unloaded"
 
-#: modules/core/os_modinfo.cpp:52
+#: modules/core/os_modinfo.cpp:53
 #, c-format
 msgid "Module: %s Version: %s Author: %s loaded: %s"
 msgstr "Module: %s Version: %s Author: %s loaded: %s"
 
-#: modules/core/os_modlist.cpp:143 modules/core/os_modlist.cpp:150
-#: modules/core/os_modlist.cpp:157 modules/core/os_modlist.cpp:164
-#: modules/core/os_modlist.cpp:171 modules/core/os_modlist.cpp:178
-#: modules/core/os_modlist.cpp:185 modules/core/os_modlist.cpp:192
+#: modules/core/os_modlist.cpp:144 modules/core/os_modlist.cpp:151
+#: modules/core/os_modlist.cpp:158 modules/core/os_modlist.cpp:165
+#: modules/core/os_modlist.cpp:172 modules/core/os_modlist.cpp:179
+#: modules/core/os_modlist.cpp:186 modules/core/os_modlist.cpp:193
 #, c-format
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/core/os_noop.cpp:80
+#: modules/core/os_noop.cpp:79
 msgid "NOOP {SET|REVOKE} server"
 msgstr "NOOP {SET|REVOKE} server"
 
-#: modules/core/os_stats.cpp:209
+#: modules/core/os_stats.cpp:171
 #, c-format
 msgid "NS Aliases    : %6d records, %5d kB"
 msgstr "NS Aliases    : %6d records, %5d kB"
 
-#: modules/core/os_stats.cpp:207
+#: modules/core/os_stats.cpp:169
 #, c-format
 msgid "NS Groups     : %6d records, %5d kB"
 msgstr "NS Groups     : %6d records, %5d kB"
@@ -3931,11 +3687,13 @@ msgstr "Bot tarafından kicklenmemeyi sağlar."
 msgid "New memo"
 msgstr "New memo"
 
-#: modules/core/ms_list.cpp:134
+#: modules/core/ms_list.cpp:135
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ num"
 msgstr "%s nicki için yeni mesajlar.  Okumak için: /msg %s READ num yazın."
 
-#: modules/core/ms_list.cpp:132
+#: modules/core/ms_list.cpp:133
+#, fuzzy, c-format
 msgid "New memos for %s.  To read, type: %s%s READ %s num"
 msgstr "%s kanali için yeni mesajlar.  Okumak için: /msg %s READ %s num yazın."
 
@@ -3943,141 +3701,107 @@ msgstr "%s kanali için yeni mesajlar.  Okumak için: /msg %s READ %s num yazı
 msgid "News list is full!"
 msgstr "Haber listesi dolu!"
 
-#: include/language.h:25
-#, c-format
-msgid ""
-"Nick %s has been forbidden by %s:\n"
-"%s"
-msgstr ""
-"%s nicki yasaklanmıştır. %s:\n"
-"%s"
+#: modules/core/ns_register.cpp:42
+#, fuzzy, c-format
+msgid "Nick %s has been confirmed."
+msgstr "%s nickinin kaydı silindi (dropped)."
 
-#: modules/core/os_svsnick.cpp:42 modules/core/os_svsnick.cpp:48
+#: modules/core/ns_register.cpp:38
+#, fuzzy, c-format
+msgid "Nick %s is already confirmed."
+msgstr "%s nicki zaten kayıtlı!"
+
+#: modules/core/os_svsnick.cpp:43 modules/core/os_svsnick.cpp:49
 #, c-format
 msgid "Nick %s is an illegal nickname and cannot be used."
 msgstr "Nick %s is an illegal nickname and cannot be used."
 
-#: modules/core/os_svsnick.cpp:56
+#: modules/core/os_svsnick.cpp:57
 #, c-format
 msgid "Nick %s is currently in use."
 msgstr "Nick %s is currently in use."
 
-#: modules/core/ns_forbid.cpp:80
+#: modules/core/ns_forbid.cpp:78
 #, c-format
 msgid "Nick %s is now forbidden."
 msgstr "%s nickinin Kullanımı yasaklandı."
 
-#: modules/core/ns_info.cpp:54
+#: modules/core/ns_info.cpp:48
 #, c-format
 msgid "Nick %s is part of this Network's Services."
 msgstr "Nick %s is part of this Network's Services."
 
-#: modules/core/ns_release.cpp:38
+#: modules/core/ns_release.cpp:39
 #, c-format
 msgid "Nick %s isn't being held."
 msgstr "%s nicki zaten serbest."
 
-#: include/language.h:22
-#, c-format
-msgid "Nick %s isn't currently in use."
-msgstr "%s nicki şu an kullanımda değil."
-
-#: include/language.h:21
-#, c-format
-msgid "Nick %s isn't registered."
-msgstr "%s kayıtlı bir nick değil."
-
-#: include/language.h:24
-#, c-format
-msgid "Nick %s may not be registered or used."
-msgstr "%s nicki kayıt edilemez ve kullanılamaz."
-
 #: modules/core/os_ignore.cpp:218
 #, c-format
 msgid "Nick %s not found on ignore list."
 msgstr "%s not found on ignore list."
 
-#: modules/core/os_svsnick.cpp:35
+#: modules/core/os_svsnick.cpp:36
 #, c-format
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: modules/core/ns_saset_noexpire.cpp:39
+#: modules/core/ns_saset_noexpire.cpp:40
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/core/ns_saset_noexpire.cpp:34
+#: modules/core/ns_saset_noexpire.cpp:35
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
 
-#: modules/core/ms_check.cpp:64
+#: modules/core/ms_check.cpp:65
 #, c-format
 msgid "Nick %s doesn't have a memo from you."
 msgstr "Nick %s doesn't have a memo from you."
 
-#: modules/core/ns_logout.cpp:47
+#: modules/core/ns_logout.cpp:48
 #, c-format
 msgid "Nick %s has been logged out."
 msgstr "%s nickinin çıkışı yapıldı."
 
-#: modules/core/ns_group.cpp:222
+#: modules/core/ns_group.cpp:223
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
 
-#: include/language.h:27
-#, c-format
-msgid "Nick %s is currently suspended."
-msgstr "Nick %s is currently suspended."
-
-#: modules/core/ns_suspend.cpp:150
+#: modules/core/ns_suspend.cpp:141
 #, c-format
 msgid "Nick %s is now released."
 msgstr "Nick %s is now released."
 
-#: modules/core/ns_suspend.cpp:82
+#: modules/core/ns_suspend.cpp:80
 #, c-format
 msgid "Nick %s is now suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/core/ns_register.cpp:296
-msgid "Nick NOT registered, please try again later."
-msgstr "Nick NOT registered, please try again later."
-
-#: modules/core/ns_register.cpp:71
-#, c-format
-msgid "Nickname %s confirmed"
-msgstr "Nickname %s confirmed"
-
-#: modules/core/ns_drop.cpp:46 modules/core/ns_drop.cpp:54
-#: modules/core/ns_drop.cpp:103 modules/core/ns_drop.cpp:108
+#: modules/core/ns_drop.cpp:76 modules/core/ns_drop.cpp:81
 #, c-format
 msgid "Nickname %s has been dropped."
 msgstr "%s nickinin kaydı silindi (dropped)."
 
-#: include/language.h:51
-#, c-format
-msgid "Nickname %s is already registered!"
-msgstr "%s nicki zaten kayıtlı!"
-
-#: include/language.h:50
-#, c-format
-msgid "Nickname %s may not be registered."
-msgstr "%s nicki kayıt edilemez."
-
-#: modules/core/ns_register.cpp:55
+#: modules/core/ns_register.cpp:189
 #, c-format
 msgid "Nickname %s registered under your account: %s"
 msgstr "%s nicki sizin adınıza kayıt edildi: %s"
 
-#: modules/core/ns_register.cpp:57
+#: modules/core/ns_register.cpp:191
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/core/ns_help.cpp:48
+#: modules/core/ns_register.cpp:353
+#, c-format
+msgid "Nickname Registration (%s)"
+msgstr "Nickname Registration (%s)"
+
+#: modules/core/ns_help.cpp:51
 #, c-format
 msgid ""
 "Nicknames that are not used anymore are subject to \n"
@@ -4088,26 +3812,36 @@ msgstr ""
 "kaydının silinmesi söz konusudur, mesela kullanılmayan\n"
 "nickler %d gün sonra silinirler."
 
-#: modules/core/bs_set.cpp:135 modules/core/bs_set.cpp:140
+#: modules/core/bs_set.cpp:141
 #, fuzzy, c-format
-msgid "No Bot mode is now  on channel %s."
+msgid "No Bot mode is now off on channel %s."
 msgstr "Bot yok modu %s kanalı için AKTİF."
 
-#: modules/core/ns_getemail.cpp:48
+#: modules/core/bs_set.cpp:136
+#, fuzzy, c-format
+msgid "No Bot mode is now on on channel %s."
+msgstr "Bot yok modu %s kanalı için AKTİF."
+
+#: modules/core/ns_getemail.cpp:49
 #, c-format
 msgid "No Emails listed for %s."
 msgstr "No Emails listed for %s."
 
-#: modules/core/bs_info.cpp:206
+#: modules/core/bs_info.cpp:207
 msgid "No bot"
 msgstr "Bot yok"
 
-#: src/commands.cpp:200
+#: modules/core/cs_info.cpp:99
+#, fuzzy
+msgid "No expire"
+msgstr "zaman aşımı yok"
+
+#: src/commands.cpp:205
 #, c-format
 msgid "No help available for %s."
 msgstr "%s hakkında yardım bulunamadı."
 
-#: modules/core/os_modinfo.cpp:62
+#: modules/core/os_modinfo.cpp:63
 #, c-format
 msgid "No information about module %s is available"
 msgstr "No information about module %s is available"
@@ -4122,13 +3856,13 @@ msgid "No matching entries on %s %s list."
 msgstr "%s kanali AOP listesinde uyusan kayit bulunamadi."
 
 #: modules/core/cs_access.cpp:31 modules/core/cs_access.cpp:122
-#: modules/core/cs_access.cpp:317 modules/core/cs_access.cpp:359
+#: modules/core/cs_access.cpp:323 modules/core/cs_access.cpp:365
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Uyuşan kayıt %s kanalının access listesinde yok."
 
-#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:146
-#: modules/core/cs_akick.cpp:382 modules/core/cs_akick.cpp:433
+#: modules/core/cs_akick.cpp:67 modules/core/cs_akick.cpp:145
+#: modules/core/cs_akick.cpp:381 modules/core/cs_akick.cpp:432
 #, c-format
 msgid "No matching entries on %s autokick list."
 msgstr "Uyuşan kayıt %s kanalının akick listesinde bulunamadı."
@@ -4139,39 +3873,43 @@ msgstr "Uyuşan kayıt %s kanalının akick listesinde bulunamadı."
 msgid "No matching entries on %s bad words list."
 msgstr "Uyuşan kayıt %s kanalının küfür listesinde bulunamadı."
 
-#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:385
-#: modules/core/os_session.cpp:418
+#: modules/core/os_session.cpp:29 modules/core/os_session.cpp:396
+#: modules/core/os_session.cpp:429
 msgid "No matching entries on session-limit exception list."
 msgstr "session-limit exception listesinde uyuşan kayıt bulunamadı."
 
 #: modules/core/os_akill.cpp:28 modules/core/os_akill.cpp:68
-#: modules/core/os_akill.cpp:321 modules/core/os_akill.cpp:365
+#: modules/core/os_akill.cpp:290 modules/core/os_akill.cpp:334
 msgid "No matching entries on the AKILL list."
 msgstr "Uyuşan kayıt AKILL listesinde bulunamadı."
 
 #: modules/core/os_snline.cpp:29 modules/core/os_snline.cpp:69
-#: modules/core/os_snline.cpp:336 modules/core/os_snline.cpp:380
+#: modules/core/os_snline.cpp:304 modules/core/os_snline.cpp:348
 msgid "No matching entries on the SNLINE list."
 msgstr "SNLINE listesinde uyuşan kayıt bulunamadı."
 
 #: modules/core/os_sqline.cpp:28 modules/core/os_sqline.cpp:68
-#: modules/core/os_sqline.cpp:316 modules/core/os_sqline.cpp:360
+#: modules/core/os_sqline.cpp:284 modules/core/os_sqline.cpp:328
 msgid "No matching entries on the SQLINE list."
 msgstr "SQLINE listesinde uyusan kayit bulunamadi."
 
 #: modules/core/os_szline.cpp:28 modules/core/os_szline.cpp:68
-#: modules/core/os_szline.cpp:320 modules/core/os_szline.cpp:362
+#: modules/core/os_szline.cpp:288 modules/core/os_szline.cpp:330
 msgid "No matching entries on the SZLINE list."
 msgstr "SZLINE listesinde uyuşan kayıt bulunamadı."
 
-#: modules/core/ms_cancel.cpp:52
+#: modules/core/ms_cancel.cpp:53
 msgid "No memo was cancelable."
 msgstr "İptal edilecek mesaj yoktu."
 
-#: modules/core/os_modlist.cpp:201
+#: modules/core/os_modlist.cpp:202
 msgid "No modules currently loaded"
 msgstr "No modules currently loaded"
 
+#: modules/core/os_login.cpp:31
+msgid "No oper block for your nick."
+msgstr ""
+
 #: modules/core/os_news.cpp:56
 msgid "No oper news items to delete!"
 msgstr "Silebileceğiniz operatör haberleri maddesi yok!"
@@ -4180,16 +3918,12 @@ msgstr "Silebileceğiniz operatör haberleri maddesi yok!"
 msgid "No random news items to delete!"
 msgstr "Silinecek karisik haber yok!"
 
-#: include/language.h:36
-msgid "No reason"
-msgstr "Sebep yok"
-
 #: src/chanserv.cpp:68
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "SIGNKICK LEVEL kullanıldığında işaretli atma yapılmaz."
 
-#: modules/core/ns_info.cpp:128 modules/core/cs_info.cpp:99
-#: modules/core/bs_info.cpp:64 modules/core/bs_info.cpp:214
+#: modules/core/ns_info.cpp:122 modules/core/cs_info.cpp:101
+#: modules/core/bs_info.cpp:65 modules/core/bs_info.cpp:215
 msgid "None"
 msgstr "YOK"
 
@@ -4197,7 +3931,7 @@ msgstr "YOK"
 msgid "Not allowed to join channel"
 msgstr "RESTRICTED özelliğinin aktif olması halinde kanala giremez."
 
-#: modules/core/cs_help.cpp:46
+#: modules/core/cs_help.cpp:49
 #, c-format
 msgid ""
 "Note that any channel which is not used for %d days\n"
@@ -4208,28 +3942,28 @@ msgstr ""
 "(kanalın access listesinde olan bir kimse o süre içinde \n"
 "kanala girmezse ) kaydı silinir."
 
-#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:378
+#: modules/core/os_session.cpp:74 modules/core/os_session.cpp:389
 msgid "Num  Limit  Host"
 msgstr "Sayı  Limit  Host"
 
-#: modules/core/os_oline.cpp:65
+#: modules/core/os_oline.cpp:66
 msgid "OLINE nick flags"
 msgstr "OLINE nick flags"
 
-#: modules/core/cs_info.cpp:84
+#: modules/core/cs_info.cpp:85
 msgid "OP Notice"
 msgstr "OP Notu"
 
-#: modules/core/cs_modes.cpp:117
+#: modules/core/cs_modes.cpp:118
 #, fuzzy
 msgid "OP [#channel] [nick]"
 msgstr "OP #channel [nick]"
 
-#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:359
+#: modules/core/os_news.cpp:48 modules/core/os_news.cpp:360
 msgid "OPERNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "OPERNEWS {ADD|DEL|LIST} [yazı|num]"
 
-#: modules/core/cs_modes.cpp:437
+#: modules/core/cs_modes.cpp:406
 #, fuzzy
 msgid "OWNER [#channel] [nick]"
 msgstr "OP #channel [nick]"
@@ -4238,13 +3972,18 @@ msgstr "OP #channel [nick]"
 msgid "Old info is equal to the new one."
 msgstr "Eski bilgiler şimdikilerle aynı."
 
-#: modules/core/os_staff.cpp:25
+#: modules/core/os_staff.cpp:26
 msgid "On Level Nick"
 msgstr "On Level Nick"
 
-#: modules/core/cs_set_opnotice.cpp:32 modules/core/cs_set_opnotice.cpp:37
+#: modules/core/cs_set_opnotice.cpp:38
+#, fuzzy, c-format
+msgid "Op-notice option for %s is now off."
+msgstr "Op-notice option for %s is now ON."
+
+#: modules/core/cs_set_opnotice.cpp:33
 #, fuzzy, c-format
-msgid "Op-notice option for %s is now ."
+msgid "Op-notice option for %s is now on."
 msgstr "Op-notice option for %s is now ON."
 
 #: modules/core/os_news.cpp:55
@@ -4253,131 +3992,95 @@ msgid "Oper news item #%d deleted."
 msgstr "Operatör haberleri maddesi #%d silindi."
 
 #: modules/core/os_news.cpp:54
-#, c-format
-msgid "Oper news item #%d not found!"
+#, fuzzy, c-format
+msgid "Oper news item #%s not found!"
 msgstr "Operatör haberleri maddesi #%d bulunamadı!"
 
 #: modules/core/os_news.cpp:49
 msgid "Oper news items:"
 msgstr "Operatör haberleri:"
 
-#: modules/core/os_stats.cpp:223
+#: modules/core/os_stats.cpp:185
 #, c-format
 msgid "OperServ      : %6d records, %5d kB"
 msgstr "OperServ   : %6d kayıt, %5d kB"
 
-#: modules/core/os_oline.cpp:38 modules/core/os_oline.cpp:44
+#: modules/core/os_oline.cpp:39 modules/core/os_oline.cpp:45
 #, c-format
 msgid "Operflags %s have been added for %s."
 msgstr "An O:Line with the flags %s has been added for %s."
 
-#: modules/core/bs_info.cpp:186
+#: modules/core/bs_info.cpp:187
 msgid "Ops protection"
 msgstr "Opları koruma"
 
-#: modules/core/ns_set_message.cpp:32
+#: modules/core/ns_set_message.cpp:33
 #, c-format
 msgid "Option %s cannot be set on this network."
 msgstr "Option %s cannot be set on this network."
 
-#: modules/core/cs_modes.cpp:357
+#: modules/core/cs_modes.cpp:334
 #, fuzzy
 msgid "PROTECT [#channel] [nick]"
 msgstr "PROTECT #channel [nick]"
 
-#: modules/core/ns_getpass.cpp:38
-#, c-format
-msgid "Passcode for %s is %s."
-msgstr "Passcode for %s is %s."
-
-#: modules/core/ns_identify.cpp:82
+#: modules/core/ns_identify.cpp:63
 msgid "Password accepted - you are now recognized."
 msgstr "Şifre kabul edildi."
 
-#: include/language.h:33
-msgid ""
-"Password authentication required for that command.\n"
-"Retry after typing %s%s IDENTIFY password."
-msgstr ""
-"Bu komutu kullanabilmek için şifrenizi girmelisiniz.\n"
-"/msg %s IDENTIFY şifreniz yazarak yeniden deneyiniz."
-
-#: include/language.h:60
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
-#: include/language.h:59
-#, c-format
-msgid "Password for %s changed."
-msgstr "Password for %s changed."
+#: modules/core/os_login.cpp:46
+#, fuzzy
+msgid "Password accepted."
+msgstr "Şifre geçersiz."
 
-#: modules/core/ns_getpass.cpp:54
+#: modules/core/ns_getpass.cpp:42
 #, c-format
 msgid "Password for %s is %s."
 msgstr "%s nickinin şifresi %s."
 
-#: include/language.h:16
-msgid "Password incorrect."
-msgstr "Şifre geçersiz."
-
-#: modules/core/ns_sendpass.cpp:46
+#: modules/core/ns_sendpass.cpp:47
 #, c-format
 msgid "Password of %s has been sent."
 msgstr "%s nickinin şifresi gönderildi."
 
-#: modules/core/ns_resetpass.cpp:42
+#: modules/core/ns_resetpass.cpp:43
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/core/cs_info.cpp:85
+#: modules/core/cs_info.cpp:86
 msgid "Peace"
 msgstr "Baris"
 
-#: modules/core/cs_set_peace.cpp:32 modules/core/cs_set_peace.cpp:37
+#: modules/core/cs_set_peace.cpp:38
 #, fuzzy, c-format
-msgid "Peace option for %s is now ."
+msgid "Peace option for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/core/cs_info.cpp:97
+#: modules/core/cs_set_peace.cpp:33
+#, fuzzy, c-format
+msgid "Peace option for %s is now on."
+msgstr "Peace option for %s is now ON."
+
+#: modules/core/cs_info.cpp:98
 msgid "Persistant"
 msgstr "Persistant"
 
-#: include/language.h:117
-msgid "Please contact an Operator to get a vhost assigned to this nick."
-msgstr "Please contact an Operator to get a vhost assigned to this nick."
-
-#: include/language.h:18
-#, fuzzy
-msgid ""
-"Please try again with a more obscure password. Passwords should be at least "
-"five characters long, should not be something easily guessed (e.g. your real "
-"name or your nick), and cannot contain the space or tab characters."
-msgstr ""
-"Lütfen daha zor bir şifre deneyin.  Şifreler en az 5 karakter uzunlukta, "
-"kolayca tahmin edilemeyecek birşey olmalıdır(ör: gerçek isminiz, nickiniz v."
-"b. olmamalıdır), ve boşlukla tab kullanılmamalıdır."
-
-#: modules/core/os_jupe.cpp:31
+#: modules/core/os_jupe.cpp:32
 msgid "Please use a valid server name when juping"
 msgstr "Please use a valid server name when juping"
 
-#: include/language.h:73
-msgid "Please use the symbol of # when attempting to register"
-msgstr "Please use the symbol of # when attempting to register"
-
-#: src/mail.cpp:48 src/mail.cpp:69
+#: src/mail.cpp:48
 #, c-format
 msgid "Please wait %d seconds and retry."
 msgstr "Lütfen %d saniye bekleyin ve tekrar deneyin."
 
-#: modules/core/ns_group.cpp:61
+#: modules/core/ns_group.cpp:60
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "GROUP komutunu tekrar kullanmadan önce lütfen %d saniye bekleyin."
 
-#: modules/core/ns_register.cpp:254
+#: modules/core/ns_register.cpp:151
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Lütfen %d saniye REGISTER komutunu tekrar kullanmak için bekleyin."
@@ -4392,63 +4095,122 @@ msgstr "Please wait %d seconds before using the RSEND command again."
 msgid "Please wait %d seconds before using the SEND command again."
 msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
 
-#: modules/core/ns_info.cpp:124 modules/core/cs_info.cpp:86
-#: modules/core/bs_info.cpp:64
+#: modules/core/cs_forbid.cpp:22
+#, fuzzy
+msgid "Prevent a channel from being used"
+msgstr "    FORBID     Kanalı kullanıma kapatır"
+
+#: modules/core/cs_suspend.cpp:21
+#, fuzzy
+msgid "Prevent a channel from being used preserving channel data and settings"
+msgstr ""
+"    SUSPEND    Prevent a channel from being used preserving\n"
+"               channel data and settings"
+
+#: modules/core/cs_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the channel from expiring"
+msgstr "    NOEXPIRE      Prevent the channel from expiring"
+
+#: modules/core/ns_set_private.cpp:21
+#, fuzzy, c-format
+msgid "Prevent the nickname from appearing in a %s%s LIST"
+msgstr ""
+"    PRIVATE    Prevent the nickname from appearing in a\n"
+"                   /msg %s LIST"
+
+#: modules/core/ns_saset_noexpire.cpp:21
+#, fuzzy
+msgid "Prevent the nickname from expiring"
+msgstr "    NOEXPIRE   Prevent the nickname from expiring"
+
+#: modules/core/ns_forbid.cpp:21
+#, fuzzy
+msgid "Prevents a nickname from being registered"
+msgstr "    FORBID     Bir nickin kullanılmasını yasaklar"
+
+#: modules/core/ns_info.cpp:118 modules/core/cs_info.cpp:87
+#: modules/core/bs_info.cpp:65
 msgid "Private"
 msgstr "Özel"
 
-#: modules/core/bs_set.cpp:48 modules/core/bs_set.cpp:53
+#: modules/core/bs_set.cpp:54
 #, fuzzy, c-format
-msgid "Private mode of bot %s is now ."
+msgid "Private mode of bot %s is now off."
 msgstr "%s botunun özel seçenegi artik AKTIF."
 
-#: modules/core/cs_set_private.cpp:32 modules/core/cs_set_private.cpp:37
+#: modules/core/bs_set.cpp:49
 #, fuzzy, c-format
-msgid "Private option for %s is now ."
+msgid "Private mode of bot %s is now on."
+msgstr "%s botunun özel seçenegi artik AKTIF."
+
+#: modules/core/cs_set_private.cpp:38
+#, fuzzy, c-format
+msgid "Private option for %s is now off."
 msgstr "Private option for %s is now ON."
 
-#: modules/core/ns_set_private.cpp:35 modules/core/ns_set_private.cpp:40
+#: modules/core/cs_set_private.cpp:33
 #, fuzzy, c-format
-msgid "Private option is now  for %s."
+msgid "Private option for %s is now on."
+msgstr "Private option for %s is now ON."
+
+#: modules/core/ns_set_private.cpp:41
+#, fuzzy, c-format
+msgid "Private option is now off for %s."
+msgstr "Private option is now ON for %s."
+
+#: modules/core/ns_set_private.cpp:36
+#, fuzzy, c-format
+msgid "Private option is now on for %s."
 msgstr "Private option is now ON for %s."
 
-#: modules/core/ns_info.cpp:122
+#: modules/core/ns_info.cpp:116
 msgid "Protection"
 msgstr "Kill koruması"
 
-#: modules/core/ns_set_kill.cpp:45
+#: modules/core/ns_set_kill.cpp:65
+#, fuzzy, c-format
+msgid "Protection is now off for %s."
+msgstr "Protection is now ON for %s."
+
+#: modules/core/ns_set_kill.cpp:46
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with a reduced delay."
+msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Protection is now ON for %s, with a reduced delay."
 
-#: modules/core/ns_set_kill.cpp:54
+#: modules/core/ns_set_kill.cpp:55
 #, fuzzy, c-format
-msgid "Protection is now  for %s, with no delay."
+msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/core/ns_set_kill.cpp:38 modules/core/ns_set_kill.cpp:64
+#: modules/core/ns_set_kill.cpp:39
 #, fuzzy, c-format
-msgid "Protection is now  for %s."
+msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
 
+#: modules/core/cs_modes.cpp:306
+#, fuzzy
+msgid "Protects a selected nick on a channel"
+msgstr "    PROTECT    Protects a selected nick on a channel"
+
 #: modules/core/os_modinfo.cpp:32
 #, fuzzy
 msgid "Providing command: %%s %s"
 msgstr "Providing command: /msg %s %s"
 
-#: modules/core/cs_xop.cpp:458
+#: modules/core/cs_xop.cpp:459
 msgid "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "QOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 
-#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:396
+#: modules/core/os_news.cpp:60 modules/core/os_news.cpp:393
 msgid "RANDOMNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "RANDOMNEWS {ADD|DEL|LIST} [yazi|no]"
 
-#: modules/core/ms_read.cpp:145
+#: modules/core/ms_read.cpp:146
 msgid "READ [channel] {list | LAST | NEW}"
 msgstr "READ [kanaladı] {liste | LAST | NEW}"
 
-#: modules/core/ns_recover.cpp:119
+#: modules/core/ns_recover.cpp:121
 msgid "RECOVER nickname [password]"
 msgstr "RECOVER nick [şifre]"
 
@@ -4456,15 +4218,15 @@ msgstr "RECOVER nick [şifre]"
 msgid "REGISTER channel description"
 msgstr "REGISTER kanaladı açıklama"
 
-#: modules/core/ns_release.cpp:96
+#: modules/core/ns_release.cpp:98
 msgid "RELEASE nickname [password]"
 msgstr "RELEASE nick [şifre]"
 
-#: modules/core/ns_resetpass.cpp:59
+#: modules/core/ns_resetpass.cpp:60
 msgid "RESETPASS nickname"
 msgstr "RESETPASS nickname"
 
-#: modules/core/ms_rsend.cpp:75
+#: modules/core/ms_rsend.cpp:76
 msgid "RSEND {nick | channel} memo-text"
 msgstr "RSEND {nick | channel} memo-text"
 
@@ -4474,290 +4236,366 @@ msgid "Random news item #%d deleted."
 msgstr "#%d numarali karisik haber silindi."
 
 #: modules/core/os_news.cpp:66
-#, c-format
-msgid "Random news item #%d not found!"
+#, fuzzy, c-format
+msgid "Random news item #%s not found!"
 msgstr "#%d numarali karisik haber bulunamadi!"
 
 #: modules/core/os_news.cpp:61
 msgid "Random news items:"
 msgstr "Karisik haberler:"
 
-#: modules/core/ns_register.cpp:112
-msgid ""
-"Registration step 1 may have expired, please use \"%s%s register <password> "
-"<email>\" first."
+#: modules/core/ms_read.cpp:54
+#, fuzzy
+msgid "Read a memo or memos"
+msgstr "    READ   Mesajları okumanızı sağlar"
+
+#: modules/core/cs_access.cpp:672
+#, fuzzy
+msgid "Redefine the meanings of access levels"
+msgstr "    LEVELS     Access seviyelerini isteğinize göre düzenler"
+
+#: modules/core/ns_release.cpp:22
+#, fuzzy
+msgid "Regain custody of your nick after RECOVER"
 msgstr ""
-"Registration step 1 may have expired, please use \"/msg %s register "
-"<password> <email>\" first."
+"    RELEASE    RECOVER komutundan sonra nickinizi serbest \n"
+"               bırakır"
 
-#: modules/core/ns_resetpass.cpp:149
-#, c-format
-msgid "Reset password request for %s"
-msgstr "Reset password request for %s"
+#: modules/core/cs_register.cpp:22
+#, fuzzy
+msgid "Register a channel"
+msgstr "    REGISTER   Nickinizi kaydeder"
+
+#: modules/core/ns_register.cpp:95
+#, fuzzy
+msgid "Register a nickname"
+msgstr "    REGISTER   Nickinizi kaydeder"
 
-#: modules/core/cs_info.cpp:87
+#: modules/core/cs_set_peace.cpp:21
+#, fuzzy
+msgid "Regulate the use of critical commands"
+msgstr "    PEACE         kritik komutlarin kullanilmasini engeller"
+
+#: modules/core/cs_suspend.cpp:99
+#, fuzzy
+msgid "Releases a suspended channel"
+msgstr "    UNSUSPEND  Releases a suspended channel"
+
+#: modules/core/os_modreload.cpp:21
+#, fuzzy
+msgid "Reload a module"
+msgstr "    MODLOAD     Load a module"
+
+#: modules/core/os_reload.cpp:21
+#, fuzzy
+msgid "Reload services' configuration file"
+msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
+
+#: modules/core/ns_group.cpp:187
+#, fuzzy
+msgid "Remove a nick from a group"
+msgstr "    UNGROUP    Remove a nick from a group"
+
+#: modules/core/cs_unban.cpp:21
+#, fuzzy
+msgid "Remove all bans preventing a user from entering a channel"
+msgstr ""
+"    UNBAN      Remove all bans preventing a user from entering a channel"
+
+#: modules/core/cs_modes.cpp:415
+#, fuzzy
+msgid "Removes your owner status on a channel"
+msgstr "    DEOWNER    Removes your owner status on a channel"
+
+#: modules/core/ns_register.cpp:313
+msgid "Resend the registration passcode"
+msgstr ""
+
+#: modules/core/cs_set_restricted.cpp:20
+#, fuzzy
+msgid "Restrict access to the channel"
+msgstr "    RESTRICTED    Kanala izinli giriş gerektirir"
+
+#: modules/core/cs_info.cpp:88
 msgid "Restricted Access"
 msgstr "Kisitli Erisim."
 
-#: modules/core/cs_set_restricted.cpp:33 modules/core/cs_set_restricted.cpp:40
+#: modules/core/cs_set_restricted.cpp:41
 #, fuzzy, c-format
-msgid "Restricted access option for %s is now ."
+msgid "Restricted access option for %s is now off."
 msgstr "Restricted access option for %s is now ON."
 
-#: modules/core/ns_set_message.cpp:94
+#: modules/core/cs_set_restricted.cpp:34
+#, fuzzy, c-format
+msgid "Restricted access option for %s is now on."
+msgstr "Restricted access option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:21
+#, fuzzy
+msgid "Retain topic when channel is not in use"
+msgstr "    KEEPTOPIC     Kanalda kimse olmasa bile topiği hatırlar"
+
+#: modules/core/ns_getpass.cpp:21
+#, fuzzy
+msgid "Retrieve the password for a nickname"
+msgstr ""
+"    GETPASS    Bir nickin şifresini öğrenmek içindir\n"
+"               (Sadece şifreleme(encryption) devre dışıysa)"
+
+#: modules/core/cs_status.cpp:21
+#, fuzzy
+msgid "Returns the current access level of a user on a channel"
+msgstr "    STATUS     Kullanıcının kanaldaki access seviyesini söyler"
+
+#: modules/core/cs_getkey.cpp:21
+#, fuzzy
+msgid "Returns the key of the given channel"
+msgstr "    GETKEY     Returns the key of the given channel"
+
+#: modules/core/ns_status.cpp:22
+#, fuzzy
+msgid "Returns the owner status of the given nickname"
+msgstr "    STATUS     Returns the owner status of the given nickname"
+
+#: modules/core/ns_logout.cpp:21
+#, fuzzy
+msgid "Reverses the effect of the IDENTIFY command"
+msgstr "    LOGOUT     Reverses the effect of the IDENTIFY command"
+
+#: modules/core/ns_set_message.cpp:90
 msgid "SASAET nickname PRIVATE {ON | OFF}"
 msgstr "SSAET nickname PRIVATE {ON | OFF}"
 
-#: include/language.h:74
-msgid "SASET channel option parameters"
-msgstr "SASET channel option parameters"
-
-#: modules/core/cs_set_keeptopic.cpp:77
+#: modules/core/cs_set_keeptopic.cpp:73
 msgid "SASET channel KEEPTOPIC {ON | OFF}"
 msgstr "SASET channel KEEPTOPIC {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:76
+#: modules/core/cs_set_opnotice.cpp:72
 msgid "SASET channel OPNOTICE {ON | OFF}"
 msgstr "SASET channel OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:76
+#: modules/core/cs_set_peace.cpp:72
 msgid "SASET channel PEACE {ON | OFF}"
 msgstr "SASET channel PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:148
+#: modules/core/cs_set_persist.cpp:144
 msgid "SASET channel PERSIST {ON | OFF}"
 msgstr "SASET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:75
+#: modules/core/cs_set_private.cpp:71
 msgid "SASET channel PRIVATE {ON | OFF}"
 msgstr "SASET channel PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:78
+#: modules/core/cs_set_restricted.cpp:74
 msgid "SASET channel RESTRICTED {ON | OFF}"
 msgstr "SASET channel RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:77
+#: modules/core/cs_set_secure.cpp:73
 msgid "SASET channel SECURE {ON | OFF}"
 msgstr "SASET channel SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:84
+#: modules/core/cs_set_securefounder.cpp:80
 msgid "SASET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SASET channel SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:75
+#: modules/core/cs_set_secureops.cpp:71
 msgid "SASET channel SECUREOPS {ON | OFF}"
 msgstr "SASET channel SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:89
+#: modules/core/cs_set_signkick.cpp:86
 msgid "SASET channel SIGNKICK {ON | OFF}"
 msgstr "SASET channel SIGNKICK {ON | OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:76
+#: modules/core/cs_set_topiclock.cpp:72
 msgid "SASET channel TOPICLOCK {ON | OFF}"
 msgstr "SASET channel TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:130
+#: modules/core/cs_set_xop.cpp:126
 msgid "SASET channel XOP {ON | OFF}"
 msgstr "SASET channel XOP {ON | OFF}"
 
-#: include/language.h:56
-msgid "SASET nickname option parameters"
-msgstr "SASET nickname option parameters"
-
-#: modules/core/ns_set_autoop.cpp:87
+#: modules/core/ns_set_autoop.cpp:83
 msgid "SASET nickname AUTOOP {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:130
+#: modules/core/ns_set_kill.cpp:126
 msgid "SASET nickname KILL {ON | QUICK | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:107
+#: modules/core/ns_set_language.cpp:101
 msgid "SASET nickname LANGUAGE number"
 msgstr "SASET nickname LANGUAGE number"
 
-#: modules/core/ns_saset_noexpire.cpp:58
+#: modules/core/ns_saset_noexpire.cpp:59
 msgid "SASET nickname NOEXPIRE {ON | OFF}"
 msgstr "SASET nickname NOEXPIRE {ON | OFF}"
 
-#: modules/core/ns_set_private.cpp:92
+#: modules/core/ns_set_private.cpp:90
 msgid "SASET nickname PRIVATE {ON | OFF}"
 msgstr "SASET nickname PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:96
+#: modules/core/ns_set_secure.cpp:92
 msgid "SASET nickname SECURE {ON | OFF}"
 msgstr "SASET nickname SECURE {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:130
+#: modules/core/ns_set_hide.cpp:126
 #, fuzzy
 msgid ""
 "SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | "
 "STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/bs_say.cpp:73
+#: modules/core/bs_say.cpp:74
 msgid "SAY channel text"
 msgstr "SAY kanaladı yazı"
 
-#: include/language.h:99
-msgid "SEND {nick | channel} memo-text"
-msgstr "SEND {nick | kanaladı} mesaj"
-
-#: modules/core/ms_sendall.cpp:57
+#: modules/core/ms_sendall.cpp:58
 #, fuzzy
 msgid "SENDALL memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/ns_sendpass.cpp:70
+#: modules/core/ns_sendpass.cpp:71
 msgid "SENDPASS nickname"
 msgstr "SENDPASS nick"
 
-#: modules/core/ns_sendpass.cpp:50
+#: modules/core/ns_sendpass.cpp:51
 msgid "SENDPASS command unavailable because encryption is in use."
 msgstr "SENDPASS komutu devre dışı çünkü şifreleme(encryption) devrede."
 
-#: modules/core/os_session.cpp:210
+#: modules/core/os_session.cpp:216
 msgid "SESSION LIST limit"
 msgstr "SESSION LIST limit"
 
-#: modules/core/hs_set.cpp:37 modules/core/hs_set.cpp:110
+#: modules/core/hs_set.cpp:38 modules/core/hs_set.cpp:111
 msgid "SET <nick> <hostmask>."
 msgstr "SET <nick> <hostmask>."
 
-#: modules/core/bs_set.cpp:296
+#: modules/core/bs_set.cpp:297
 msgid "SET (channel | bot) option settings"
 msgstr "SET kanaladı özellik ayarlar"
 
-#: modules/core/bs_set.cpp:143
+#: modules/core/bs_set.cpp:144
 #, fuzzy
 msgid "SET botname NOBOT {ON|}"
 msgstr "SET kanaladı NOBOT {ON|OFF}"
 
-#: modules/core/bs_set.cpp:56
+#: modules/core/bs_set.cpp:57
 #, fuzzy
 msgid "SET botname PRIVATE {ON|}"
 msgstr "SET kanaladi PRIVATE {ON|OFF}"
 
-#: include/language.h:75
-msgid "SET channel option parameters"
-msgstr "SET kanaladı özellik parametre"
-
-#: modules/core/bs_set.cpp:81
+#: modules/core/bs_set.cpp:82
 #, fuzzy
 msgid "SET channel DONTKICKOPS {ON|}"
 msgstr "SET kanaladı DONTKICKOPS {ON|OFF}"
 
-#: modules/core/bs_set.cpp:96
+#: modules/core/bs_set.cpp:97
 #, fuzzy
 msgid "SET channel DONTKICKVOICES {ON|}"
 msgstr "SET kanaladı DONTKICKVOICES {ON|OFF}"
 
-#: modules/core/bs_set.cpp:111
+#: modules/core/bs_set.cpp:112
 #, fuzzy
 msgid "SET channel FANTASY {ON|}"
 msgstr "SET kanaladı FANTASY {ON|OFF}"
 
-#: modules/core/bs_set.cpp:126
+#: modules/core/bs_set.cpp:127
 #, fuzzy
 msgid "SET channel GREET {ON|}"
 msgstr "SET kanaladı GREET {ON|OFF}"
 
-#: modules/core/cs_set_keeptopic.cpp:59
+#: modules/core/cs_set_keeptopic.cpp:60
 msgid "SET channel KEEPTOPIC {ON | OFF}"
 msgstr "SET kanaladı KEEPTOPIC {ON | OFF}"
 
-#: modules/core/bs_set.cpp:191
+#: modules/core/bs_set.cpp:192
 #, fuzzy
 msgid "SET channel MSG {OFF|PRIVMSG|NOTICE|}"
 msgstr "SET kanaladı OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_saset_noexpire.cpp:56
+#: modules/core/cs_saset_noexpire.cpp:57
 msgid "SET channel NOEXPIRE {ON | OFF}"
 msgstr "SET kanaladı NOEXPIRE {ON | OFF}"
 
-#: modules/core/cs_set_opnotice.cpp:58
+#: modules/core/cs_set_opnotice.cpp:59
 msgid "SET channel OPNOTICE {ON | OFF}"
 msgstr "SET kanaladı OPNOTICE {ON | OFF}"
 
-#: modules/core/cs_set_peace.cpp:58
+#: modules/core/cs_set_peace.cpp:59
 msgid "SET channel PEACE {ON | OFF}"
 msgstr "SET kanaladi PEACE {ON | OFF}"
 
-#: modules/core/cs_set_persist.cpp:130
+#: modules/core/cs_set_persist.cpp:131
 msgid "SET channel PERSIST {ON | OFF}"
 msgstr "SET channel PERSIST {ON | OFF}"
 
-#: modules/core/cs_set_private.cpp:57
+#: modules/core/cs_set_private.cpp:58
 msgid "SET channel PRIVATE {ON | OFF}"
 msgstr "SET kanaladı PRIVATE {ON | OFF}"
 
-#: modules/core/cs_set_restricted.cpp:60
+#: modules/core/cs_set_restricted.cpp:61
 msgid "SET channel RESTRICTED {ON | OFF}"
 msgstr "SET kanaladı RESTRICTED {ON | OFF}"
 
-#: modules/core/cs_set_secure.cpp:59
+#: modules/core/cs_set_secure.cpp:60
 msgid "SET channel SECURE {ON | OFF}"
 msgstr "SET kanal SECURE {ON | OFF}"
 
-#: modules/core/cs_set_securefounder.cpp:66
+#: modules/core/cs_set_securefounder.cpp:67
 msgid "SET channel SECUREFOUNDER {ON | OFF}"
 msgstr "SET kanaladı SECUREFOUNDER {ON | OFF}"
 
-#: modules/core/cs_set_secureops.cpp:57
+#: modules/core/cs_set_secureops.cpp:58
 msgid "SET channel SECUREOPS {ON | OFF}"
 msgstr "SET kanaladı SECUREOPS {ON | OFF}"
 
-#: modules/core/cs_set_signkick.cpp:71
+#: modules/core/cs_set_signkick.cpp:73
 msgid "SET channel SIGNKICK {ON | LEVEL | OFF}"
 msgstr "SET kanaladı SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/core/bs_set.cpp:158
+#: modules/core/bs_set.cpp:159
 #, fuzzy
 msgid "SET channel SYMBIOSIS {ON|}"
 msgstr "SET kanaladı SYMBIOSIS {ON|OFF}"
 
-#: modules/core/cs_set_topiclock.cpp:58
+#: modules/core/cs_set_topiclock.cpp:59
 msgid "SET channel TOPICLOCK {ON | OFF}"
 msgstr "SET kanaladı TOPICLOCK {ON | OFF}"
 
-#: modules/core/cs_set_xop.cpp:112
+#: modules/core/cs_set_xop.cpp:113
 msgid "SET channel XOP {ON | OFF}"
 msgstr "SET kanaladi XOP {ON | OFF}"
 
-#: include/language.h:52
-msgid "SET option parameters"
-msgstr "SET özellik parametre"
-
-#: modules/core/os_set.cpp:238
+#: modules/core/os_set.cpp:244
 msgid "SET option setting"
 msgstr "SET özellik ayar"
 
-#: modules/core/ns_set_autoop.cpp:59
+#: modules/core/ns_set_autoop.cpp:60
 msgid "SET AUTOOP {ON | OFF}"
 msgstr "SET AUTOOP {ON | OFF}"
 
-#: modules/core/ns_set_hide.cpp:98
+#: modules/core/ns_set_hide.cpp:99
 msgid "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | IMMED | OFF}"
 msgstr "SET KILL {ON | QUICK | IMMED | OFF}"
 
-#: modules/core/ns_set_kill.cpp:93
+#: modules/core/ns_set_kill.cpp:94
 msgid "SET KILL {ON | QUICK | OFF}"
 msgstr "SET KILL {ON | QUICK | OFF}"
 
-#: modules/core/ns_set_language.cpp:76
+#: modules/core/ns_set_language.cpp:77
 #, fuzzy
 msgid "SET LANGUAGE language"
 msgstr "SET LANGUAGE numara"
 
-#: modules/core/ms_set.cpp:149
+#: modules/core/ms_set.cpp:147
 msgid "SET LIMIT [channel] limit"
 msgstr "SET LIMIT [kanaladı] limit"
 
@@ -4765,7 +4603,7 @@ msgstr "SET LIMIT [kanaladı] limit"
 msgid "SET LIMIT [user | channel] {limit | NONE} [HARD]"
 msgstr "SET LIMIT [kullanıcı | kanaladı] {limit | NONE} [HARD]"
 
-#: modules/core/ns_set_message.cpp:66
+#: modules/core/ns_set_message.cpp:67
 msgid "SET MSG {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
@@ -4773,24 +4611,24 @@ msgstr "SET PRIVATE {ON | OFF}"
 msgid "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 msgstr "SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF }"
 
-#: modules/core/ns_set_private.cpp:62
+#: modules/core/ns_set_private.cpp:64
 msgid "SET PRIVATE {ON | OFF}"
 msgstr "SET PRIVATE {ON | OFF}"
 
-#: modules/core/ns_set_secure.cpp:64
+#: modules/core/ns_set_secure.cpp:65
 msgid "SET SECURE {ON | OFF}"
 msgstr "SET SECURE {ON | OFF}"
 
-#: modules/core/hs_setall.cpp:117
+#: modules/core/hs_setall.cpp:118
 msgid "SETALL <nick> <hostmask>."
 msgstr "SETALL <nick> <hostmask>."
 
-#: modules/core/os_snline.cpp:261 modules/core/os_snline.cpp:304
-#: modules/core/os_snline.cpp:348
+#: modules/core/os_snline.cpp:229 modules/core/os_snline.cpp:272
+#: modules/core/os_snline.cpp:316
 msgid "SNLINE list is empty."
 msgstr "SNLINE listesi boş."
 
-#: modules/core/os_snline.cpp:470
+#: modules/core/os_snline.cpp:439
 msgid ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {mask | entry-list}[:"
 "reason]]"
@@ -4798,16 +4636,16 @@ msgstr ""
 "SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaşımı] {mask | kayıt-"
 "sırası} [sebep]]"
 
-#: modules/core/cs_xop.cpp:654
+#: modules/core/cs_xop.cpp:643
 msgid "SOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "SOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/core/os_sqline.cpp:241 modules/core/os_sqline.cpp:284
-#: modules/core/os_sqline.cpp:328
+#: modules/core/os_sqline.cpp:209 modules/core/os_sqline.cpp:252
+#: modules/core/os_sqline.cpp:296
 msgid "SQLINE list is empty."
 msgstr "SQLINE listesi bos."
 
-#: modules/core/os_sqline.cpp:450
+#: modules/core/os_sqline.cpp:419
 #, fuzzy
 msgid ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4816,54 +4654,64 @@ msgstr ""
 "SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zaman asimi] {mask | kayit-"
 "sirasi} [sebep]]"
 
-#: modules/core/ms_staff.cpp:55
+#: src/nickserv.cpp:191
+#, fuzzy
+msgid "SSL Fingerprint accepted, you are now identified"
+msgstr "Şifre kabul edildi."
+
+#: modules/core/ns_cert.cpp:203
+#, fuzzy
+msgid "SSL Fingerprint accepted. You are now identified."
+msgstr "Şifre kabul edildi."
+
+#: modules/core/ms_staff.cpp:56
 msgid "STAFF memo-text"
 msgstr "STAFF memo-text"
 
-#: modules/core/cs_status.cpp:54
+#: modules/core/cs_status.cpp:55
 msgid "STATUS channel item"
 msgstr "STATUS channel item"
 
-#: modules/core/ns_status.cpp:36 modules/core/ns_status.cpp:38
-#: modules/core/ns_status.cpp:40 modules/core/ns_status.cpp:42
-#: modules/core/ns_status.cpp:47
+#: modules/core/ns_status.cpp:37 modules/core/ns_status.cpp:39
+#: modules/core/ns_status.cpp:41 modules/core/ns_status.cpp:43
+#: modules/core/ns_status.cpp:48
 #, c-format
 msgid "STATUS %s %d %s"
 msgstr "STATUS %s %d %s"
 
-#: modules/core/cs_status.cpp:31
+#: modules/core/cs_status.cpp:32
 #, c-format
 msgid "STATUS %s %s %d"
 msgstr "STATUS %s %s %d"
 
-#: modules/core/cs_status.cpp:33
+#: modules/core/cs_status.cpp:34
 #, c-format
 msgid "STATUS ERROR Nick %s not online"
 msgstr "STATUS ERROR Nick %s not online"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 #, fuzzy
 msgid "SUSPEND channel freason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/cs_suspend.cpp:91
+#: modules/core/cs_suspend.cpp:89
 msgid "SUSPEND channel reason"
 msgstr "SUSPEND channel reason"
 
-#: modules/core/ns_suspend.cpp:98
+#: modules/core/ns_suspend.cpp:96
 msgid "SUSPEND nickname reason"
 msgstr "SUSPEND nickname reason"
 
-#: modules/core/os_svsnick.cpp:78
+#: modules/core/os_svsnick.cpp:79
 msgid "SVSNICK nick newnick "
 msgstr "SVSNICK nick newnick "
 
-#: modules/core/os_szline.cpp:245 modules/core/os_szline.cpp:288
-#: modules/core/os_szline.cpp:330
+#: modules/core/os_szline.cpp:213 modules/core/os_szline.cpp:256
+#: modules/core/os_szline.cpp:298
 msgid "SZLINE list is empty."
 msgstr "SZLINE listesi boş."
 
-#: modules/core/os_szline.cpp:450
+#: modules/core/os_szline.cpp:419
 #, fuzzy
 msgid ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+expiry] {nick | mask | entry-"
@@ -4872,64 +4720,120 @@ msgstr ""
 "SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+zamanaşımı] {mask | kayıt-"
 "sırası} [sebep]]"
 
-#: modules/core/cs_info.cpp:88
+#: modules/core/os_restart.cpp:21
+#, fuzzy
+msgid "Save databases and restart Services"
+msgstr ""
+"    RESTART     Veritabanını kaydeder ve servisleri yeniden \n"
+"                başlatır"
+
+#: modules/core/cs_info.cpp:89
 msgid "Secure"
 msgstr "Güvenlik"
 
-#: modules/core/cs_info.cpp:89
+#: modules/core/cs_info.cpp:90
 msgid "Secure Founder"
 msgstr "Secure Founder"
 
-#: modules/core/cs_info.cpp:90
+#: modules/core/cs_info.cpp:91
 msgid "Secure Ops"
 msgstr "Secure Ops"
 
-#: modules/core/cs_set_securefounder.cpp:39
-#: modules/core/cs_set_securefounder.cpp:44
+#: modules/core/cs_set_securefounder.cpp:45
+#, fuzzy, c-format
+msgid "Secure founder option for %s is now off."
+msgstr "Secure founder option for %s is now ON."
+
+#: modules/core/cs_set_securefounder.cpp:40
 #, fuzzy, c-format
-msgid "Secure founder option for %s is now ."
+msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/core/cs_set_secureops.cpp:32 modules/core/cs_set_secureops.cpp:37
+#: modules/core/cs_set_secureops.cpp:38
+#, fuzzy, c-format
+msgid "Secure ops option for %s is now off."
+msgstr "Secure ops option for %s is now ON."
+
+#: modules/core/cs_set_secureops.cpp:33
 #, fuzzy, c-format
-msgid "Secure ops option for %s is now ."
+msgid "Secure ops option for %s is now on."
 msgstr "Secure ops option for %s is now ON."
 
-#: modules/core/cs_set_secure.cpp:32 modules/core/cs_set_secure.cpp:37
+#: modules/core/cs_set_secure.cpp:38
 #, fuzzy, c-format
-msgid "Secure option for %s is now ."
+msgid "Secure option for %s is now off."
 msgstr "Secure option for %s is now ON."
 
-#: modules/core/ns_set_secure.cpp:35 modules/core/ns_set_secure.cpp:40
+#: modules/core/cs_set_secure.cpp:33
 #, fuzzy, c-format
-msgid "Secure option is now  for %s."
+msgid "Secure option for %s is now on."
+msgstr "Secure option for %s is now ON."
+
+#: modules/core/ns_set_secure.cpp:41
+#, fuzzy, c-format
+msgid "Secure option is now off for %s."
+msgstr "Secure option is now ON for %s."
+
+#: modules/core/ns_set_secure.cpp:36
+#, fuzzy, c-format
+msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/core/ns_info.cpp:123
+#: modules/core/ns_info.cpp:117
 msgid "Security"
 msgstr "Güvenlik"
 
-#: modules/core/os_stats.cpp:191
+#: modules/core/ms_send.cpp:21
+#, fuzzy
+msgid "Send a memo to a nick or channel"
+msgstr "    SEND   Nicke veya kanala mesaj gönderir"
+
+#: modules/core/ms_staff.cpp:21
+#, fuzzy
+msgid "Send a memo to all opers/admins"
+msgstr "    STAFF      Send a memo to all opers/admins"
+
+#: modules/core/ms_sendall.cpp:21
+#, fuzzy
+msgid "Send a memo to all registered users"
+msgstr "    SENDALL  Send a memo to all registered users"
+
+#: modules/core/os_global.cpp:21
+#, fuzzy
+msgid "Send a message to all users"
+msgstr "    GLOBAL      Tüm kullanıcılara mesaj gönderir"
+
+#: modules/core/cs_set_opnotice.cpp:21
+#, fuzzy
+msgid "Send a notice when OP/DEOP commands are used"
+msgstr "    OPNOTICE      OP/DEOP komutları kullanıldığında mesaj yollar"
+
+#: modules/core/ms_rsend.cpp:21
+#, fuzzy
+msgid "Sends a memo and requests a read receipt"
+msgstr "    RSEND  Sends a memo and requests a read receipt"
+
+#: modules/core/os_stats.cpp:153
 #, c-format
 msgid "Servers found: %d"
 msgstr "Servers found: %d"
 
-#: modules/core/os_defcon.cpp:217 modules/core/os_defcon.cpp:234
-#: modules/core/os_defcon.cpp:245 modules/core/os_defcon.cpp:253
-#: modules/core/os_defcon.cpp:264
+#: modules/core/os_defcon.cpp:220 modules/core/os_defcon.cpp:237
+#: modules/core/os_defcon.cpp:248 modules/core/os_defcon.cpp:256
+#: modules/core/os_defcon.cpp:267
 msgid "Services are in Defcon mode, Please try again later."
 msgstr "This service is temporarly disabled, please try again later"
 
-#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:93
+#: modules/core/os_defcon.cpp:70 modules/core/os_defcon.cpp:101
 #, c-format
 msgid "Services are now at DEFCON %d"
 msgstr "Services are now at DEFCON %d"
 
-#: modules/core/os_set.cpp:158
+#: modules/core/os_set.cpp:163
 msgid "Services are now in expire mode."
 msgstr "Servisler şimdi expire modunda."
 
-#: modules/core/os_set.cpp:152
+#: modules/core/os_set.cpp:157
 msgid "Services are now in no expire mode."
 msgstr "Servisler şimdi no expire modunda."
 
@@ -4941,7 +4845,7 @@ msgstr "Servisler şimdi read-only modunda."
 msgid "Services are now in read-write mode."
 msgstr "Servisler şimdi read-write modunda."
 
-#: modules/core/os_set.cpp:129
+#: modules/core/os_set.cpp:131
 #, c-format
 msgid "Services are now in debug mode (level %d)."
 msgstr "Servisler şimdi debug modunda (seviye %d)."
@@ -4954,7 +4858,7 @@ msgstr "Servisler şimdi debug modunda."
 msgid "Services are now in non-debug mode."
 msgstr "Servisler şimdi non-debug modunda."
 
-#: src/mail.cpp:46 src/mail.cpp:67
+#: src/mail.cpp:46
 msgid "Services have been configured to not send mail."
 msgstr "Servislerin mail gönderme özelliği devre dışıdır."
 
@@ -4964,7 +4868,7 @@ msgid ""
 "  Mask        Creator      Reason      Expires"
 msgstr ""
 
-#: modules/core/os_kick.cpp:39 modules/core/os_mode.cpp:33
+#: modules/core/os_kick.cpp:40 modules/core/os_mode.cpp:36
 #, fuzzy
 msgid ""
 "Services is unable to change modes. Are your servers' U:lines configured "
@@ -4973,150 +4877,189 @@ msgstr ""
 "Servisler mod değiştiremiyor.  Serverin U:line larının doğru ayarlandığına "
 "emin olun."
 
-#: modules/core/os_stats.cpp:137
-#, c-format
-msgid "Services up %d days, %02d:%02d"
-msgstr "Servisler %d gündür çalışıyor, %02d:%02d"
-
-#: modules/core/os_stats.cpp:145
-#, c-format
-msgid "Services up %d hours, %d minutes"
-msgstr "Servisler %d saat, %d dakikadır çalışıyor."
-
-#: modules/core/os_stats.cpp:161
-#, c-format
-msgid "Services up %d minutes, %d seconds"
-msgstr "Servisler %d dakika, %d saniyedir çalışıyor."
-
-#: modules/core/os_stats.cpp:139
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 day, "
-"OPER_STATS_UPTIME_1%02d:%02dOPER_STATS_UPTIME_1"
-msgstr ""
-
-#: modules/core/os_stats.cpp:152
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 hour, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minutes"
-msgstr ""
-
-#: modules/core/os_stats.cpp:168
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 minute, "
-"OPER_STATS_UPTIME_1%dOPER_STATS_UPTIME_1 seconds"
-msgstr ""
-
-#: modules/core/os_stats.cpp:154
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 hour, "
-"OPER_STATS_UPTIME_1H1%dOPER_STATS_UPTIME_1H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:170
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 minute, "
-"OPER_STATS_UPTIME_1M1%dOPER_STATS_UPTIME_1M1 second"
-msgstr ""
-
-#: modules/core/os_stats.cpp:147
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 hours, "
-"OPER_STATS_UPTIME_H1%dOPER_STATS_UPTIME_H1 minute"
-msgstr ""
-
-#: modules/core/os_stats.cpp:163
-#, c-format
-msgid ""
-"Services up OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 minutes, "
-"OPER_STATS_UPTIME_M1%dOPER_STATS_UPTIME_M1 second"
-msgstr ""
+#: modules/core/os_stats.cpp:135
+#, fuzzy, c-format
+msgid "Services up %s"
+msgstr "Servers found: %d"
 
-#: modules/core/ns_set_autoop.cpp:40
+#: modules/core/ns_set_autoop.cpp:41
 #, c-format
 msgid "Services will no longer autoop %s in channels."
 msgstr "Services will no longer autoop %s in channels."
 
-#: modules/core/ns_set_autoop.cpp:35
+#: modules/core/ns_set_autoop.cpp:36
 #, c-format
 msgid "Services will now autoop %s in channels."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/core/ns_set_message.cpp:41
+#: modules/core/ns_set_message.cpp:42
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/core/ns_set_message.cpp:46
+#: modules/core/ns_set_message.cpp:47
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
 
-#: modules/core/os_reload.cpp:37
+#: modules/core/os_reload.cpp:32
 msgid "Services' configuration file has been reloaded."
 msgstr "Servislerin conf dosyası yeniden yüklendi."
 
-#: modules/core/ns_release.cpp:45 modules/core/ns_release.cpp:63
+#: modules/core/ns_release.cpp:47 modules/core/ns_release.cpp:66
 msgid "Services' hold on your nick has been released."
 msgstr "Nickiniz serbest bırakıldı."
 
-#: modules/core/os_session.cpp:281
+#: modules/core/os_session.cpp:287
 #, c-format
 msgid "Session limit for %s set to %d."
 msgstr "%s için session limit %d olarak değiştirildi."
 
-#: modules/core/os_session.cpp:175 modules/core/os_session.cpp:434
+#: modules/core/os_session.cpp:181 modules/core/os_session.cpp:446
 msgid "Session limiting is disabled."
 msgstr "Session limit koyma devre dışı."
 
-#: modules/core/os_stats.cpp:225
+#: modules/core/os_stats.cpp:187
 #, c-format
 msgid "Sessions      : %6d records, %5d kB"
 msgstr "Oturumlar  : %6d kayıt, %5d kB"
 
-#: modules/core/os_session.cpp:135
+#: modules/core/os_session.cpp:140
 msgid "Sessions  Host"
 msgstr "Sessionlar  Host"
 
-#: modules/core/cs_access.cpp:573 modules/core/cs_access.cpp:603
+#: modules/core/ns_saset.cpp:24
+#, fuzzy
+msgid "Set SET-options on another nickname"
+msgstr "    SASET      Set SET-options on another nickname"
+
+#: modules/core/cs_set.cpp:24
+#, fuzzy
+msgid "Set channel options and information"
+msgstr "    SET        Kanal özelliklerini ve bilgisini ayarlar"
+
+#: modules/core/cs_set_bantype.cpp:21
+#, fuzzy
+msgid "Set how Services make bans on the channel"
+msgstr "    BANTYPE       Servislerin kanalda ne tip ban koyacağını belirler"
+
+#: modules/core/ms_set.cpp:204
+#, fuzzy
+msgid "Set options related to memos"
+msgstr "    SET    Mesajlarla ilgili ayarları yapar"
+
+#: modules/core/ns_set.cpp:24
+#, fuzzy
+msgid "Set options, including kill protection"
+msgstr "    SET        Ayarlar, kill korumasını içerir"
+
+#: modules/core/cs_set_persist.cpp:21
+#, fuzzy
+msgid "Set the channel as permanent"
+msgstr "    PERSIST       Set the channel as permanent"
+
+#: modules/core/cs_set_description.cpp:21
+#, fuzzy
+msgid "Set the channel description"
+msgstr "    DESC          Kanal açıklamasını belirler"
+
+#: modules/core/ns_saset.cpp:132
+#, fuzzy
+msgid "Set the display of the group in Services"
+msgstr "    DISPLAY    Set the display of the group in Services"
+
+#: modules/core/ns_set.cpp:129
+#, fuzzy
+msgid "Set the display of your group in Services"
+msgstr "    DISPLAY    Grubunuzun servislerde nasıl görüneceğini ayarlar"
+
+#: modules/core/cs_set_founder.cpp:21
+#, fuzzy
+msgid "Set the founder of a channel"
+msgstr "    FOUNDER       Kanal founderını belirler"
+
+#: modules/core/ns_set_language.cpp:21
+#, fuzzy
+msgid "Set the language Services will use when messaging you"
+msgstr ""
+"    LANGUAGE   Servislerin size hitap edeceği \n"
+"                  dili belirler"
+
+#: modules/core/ns_saset.cpp:175
+#, fuzzy
+msgid "Set the nickname password"
+msgstr "    PASSWORD   Set the nickname password"
+
+#: modules/core/cs_set_successor.cpp:21
+#, fuzzy
+msgid "Set the successor for a channel"
+msgstr "    SUCCESSOR     Kanal successorını belirler"
+
+#: modules/core/hs_setall.cpp:21
 #, fuzzy
+msgid "Set the vhost for all nicks in a group"
+msgstr "    SETALL      Set the vhost for all nicks in a group"
+
+#: modules/core/hs_set.cpp:21
+#, fuzzy
+msgid "Set the vhost of another user"
+msgstr "    SET         Set the vhost of another user"
+
+#: modules/core/os_set.cpp:173
+#, fuzzy
+msgid "Set various global Services options"
+msgstr "    SET         Çeşitli global servis özelliklerini ayarlar"
+
+#: modules/core/ns_set.cpp:169
+#, fuzzy
+msgid "Set your nickname password"
+msgstr "    PASSWORD   Nickinize şifre belirtir"
+
+#: modules/core/cs_access.cpp:586 modules/core/cs_access.cpp:616
+#, fuzzy, c-format
 msgid ""
 "Setting %s not known.  Type %s%s HELP LEVELS  for a list of valid settings."
 msgstr ""
 "Varolmayan ayar: %s. Geçerli ayar listesi için /msg %s HELP LEVELS DESC "
 "yazınız."
 
-#: modules/core/os_set.cpp:132
+#: modules/core/os_set.cpp:136
 #, fuzzy
-msgid "Setting for DEBUG must be , , or a positive number."
+msgid "Setting for DEBUG must be ON, OFF, or a positive number."
 msgstr "DEBUG ayarı ON, OFF, veya pozitif bir sayı olmalıdır."
 
-#: modules/core/os_set.cpp:161
+#: modules/core/os_set.cpp:166
 #, fuzzy
-msgid "Setting for NOEXPIRE must be  or ."
+msgid "Setting for NOEXPIRE must be on or off."
 msgstr "NOEXPIRE ayarı ON yada OFF olmalıdır."
 
 #: modules/core/os_set.cpp:59
 #, fuzzy
-msgid "Setting for READONLY must be  or ."
+msgid "Setting for READONLY must be on or off."
 msgstr "READONLY ayarı ON veya OFF şeklinde olmalıdır."
 
 #: modules/core/os_set.cpp:97
 #, fuzzy
-msgid "Setting for SuperAdmin must be  or  (must be enabled in services.conf)"
+msgid ""
+"Setting for SuperAdmin must be on or off (must be enabled in services.conf)"
 msgstr "Setting for SuperAdmin must be ON or OFF."
 
-#: modules/core/cs_set_signkick.cpp:33 modules/core/cs_set_signkick.cpp:46
-#, fuzzy, c-format
-msgid "Signed kick option for %s is now ."
-msgstr "Signed kick option for %s is now ON."
+#: modules/core/ns_set_autoop.cpp:21
+#, fuzzy
+msgid "Should services op you automatically."
+msgstr "    AUTOOP     Should services op you automatically.    "
+
+#: modules/core/os_stats.cpp:194
+#, fuzzy
+msgid "Show status of Services and network"
+msgstr "    STATS       Servislerin ve networkun durumunu gösterir"
+
+#: modules/core/cs_set_signkick.cpp:21
+#, fuzzy
+msgid "Sign kicks that are done with KICK command"
+msgstr "    SIGNKICK      KICK komutuyla yapılan atmaları işaretler"
 
-#: modules/core/cs_set_signkick.cpp:39
+#: modules/core/cs_set_signkick.cpp:40
 #, c-format
 msgid ""
 "Signed kick option for %s is now ON, but depends of the\n"
@@ -5125,27 +5068,33 @@ msgstr ""
 "Signed kick option for %s is now ON, but depends of the\n"
 "level of the user that is using the command."
 
-#: modules/core/cs_info.cpp:92 modules/core/cs_info.cpp:94
+#: modules/core/cs_set_signkick.cpp:47
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now off."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_set_signkick.cpp:34
+#, fuzzy, c-format
+msgid "Signed kick option for %s is now on."
+msgstr "Signed kick option for %s is now ON."
+
+#: modules/core/cs_info.cpp:93 modules/core/cs_info.cpp:95
 msgid "Signed kicks"
 msgstr "İşaretli atma"
 
-#: modules/core/ms_rsend.cpp:53
+#: modules/core/ms_rsend.cpp:54
 msgid "Sorry, RSEND has been disabled on this network."
 msgstr "Sorry, RSEND has been disabled on this network."
 
-#: include/language.h:107
-msgid "Sorry, bot assignment is temporarily disabled."
-msgstr "Kanala bot sokma geçici olarak devre dışı."
-
 #: modules/core/bs_bot.cpp:99
 msgid "Sorry, bot creation failed."
 msgstr "Bot yaratma başarısız."
 
-#: modules/core/bs_bot.cpp:316
+#: modules/core/bs_bot.cpp:317
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Botta değişiklik yapma geçici olarak devre dışı."
 
-#: modules/core/bs_set.cpp:34
+#: modules/core/bs_set.cpp:35
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot özellik ayarı geçici olarak devre dışı."
 
@@ -5155,7 +5104,7 @@ msgstr "Bot özellik ayarı geçici olarak devre dışı."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Kanal AOP listesi degisiklikleri geçici olarak devre disidir."
 
-#: modules/core/cs_access.cpp:437
+#: modules/core/cs_access.cpp:444
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Kanal access listesinin değiştirilmesi geçici olarak devre dışıdır."
 
@@ -5163,63 +5112,42 @@ msgstr "Kanal access listesinin değiştirilmesi geçici olarak devre dışıdır."
 msgid "Sorry, channel autokick list modification is temporarily disabled."
 msgstr "Kanal Akick listesinin değiştirilmesi geçici olarak devre dışıdır."
 
-#: modules/core/bs_badwords.cpp:254
+#: modules/core/bs_badwords.cpp:256
 msgid "Sorry, channel bad words list modification is temporarily disabled."
 msgstr "Kanalın küfür listesinde değişiklik yapma geçici olarak devre dışıdır."
 
-#: modules/core/cs_drop.cpp:34
+#: modules/core/cs_drop.cpp:35
 msgid "Sorry, channel de-registration is temporarily disabled."
 msgstr "Kanal kaydının silinmesi(DROP) geçici olarak devre dışıdır."
 
-#: include/language.h:76
-msgid "Sorry, channel option setting is temporarily disabled."
-msgstr "Chanserv'ün SET komutu geçici olarak devre dışıdır."
-
 #: modules/core/cs_register.cpp:35
 msgid "Sorry, channel registration is temporarily disabled."
 msgstr "Kanal kaydı geçici olarak devre dışıdır."
 
-#: include/language.h:58
-#, c-format
-msgid "Sorry, couldn't change password for %s."
-msgstr "Sorry, couldn't change password for %s."
-
-#: modules/core/ns_identify.cpp:61
+#: modules/core/ns_identify.cpp:56
 msgid "Sorry, identification failed."
 msgstr "Tanımlama başarısız."
 
-#: modules/core/bs_kick.cpp:35
+#: modules/core/bs_kick.cpp:36
 msgid "Sorry, kicker configuration is temporarily disabled."
 msgstr "Atma ayarları geçici olarak devre dışı."
 
-#: modules/core/ms_set.cpp:215
+#: modules/core/ms_set.cpp:214
 msgid "Sorry, memo option setting is temporarily disabled."
 msgstr "MemoServ'ün SET komutu geçici olarak devre dışıdır."
 
-#: include/language.h:100
-msgid "Sorry, memo sending is temporarily disabled."
-msgstr "Mesaj yollama geçici olarak devre dışıdır."
-
-#: modules/core/ns_drop.cpp:31
+#: modules/core/ns_drop.cpp:32
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Nick kaydı silinmesi geçici olarak devre dışıdır."
 
-#: modules/core/ns_group.cpp:39
+#: modules/core/ns_group.cpp:34
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Nick gruplama geçici olarak devre dışı."
 
-#: include/language.h:53
-msgid "Sorry, nickname option setting is temporarily disabled."
-msgstr "NickServ'ün SET komutu geçici olarak devre dışıdır."
-
-#: modules/core/ns_register.cpp:206
+#: modules/core/ns_register.cpp:109
 msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Nick kaydı geçici olarak devre dışıdır."
 
-#: modules/core/ns_register.cpp:126
-msgid "Sorry, registration failed."
-msgstr "Nick kaydı başarısız."
-
 #: modules/core/cs_xop.cpp:165
 #, fuzzy, c-format
 msgid "Sorry, you can only have %d %s entries on a channel."
@@ -5230,12 +5158,12 @@ msgstr "Kanalda sadece %d tane access kaydı olabilir."
 msgid "Sorry, you can only have %d access entries for a nickname."
 msgstr "Bir nick için sadece %d tane access girilebilir."
 
-#: modules/core/cs_access.cpp:229
+#: modules/core/cs_access.cpp:235
 #, c-format
 msgid "Sorry, you can only have %d access entries on a channel."
 msgstr "Kanalda sadece %d tane access kaydı olabilir."
 
-#: modules/core/cs_akick.cpp:267
+#: modules/core/cs_akick.cpp:266
 #, c-format
 msgid "Sorry, you can only have %d autokick masks on a channel."
 msgstr "Bir kanalın akick listesinde en fazla %d kişi olabilir."
@@ -5245,21 +5173,16 @@ msgstr "Bir kanalın akick listesinde en fazla %d kişi olabilir."
 msgid "Sorry, you can only have %d bad words entries on a channel."
 msgstr "Bir kanalda sadece %d tane küfür kaydı olabilir."
 
-#: include/language.h:72
-#, c-format
-msgid "Sorry, you have already exceeded your limit of %d channels."
-msgstr "%d kanallık limitinizi aştınız."
-
-#: include/language.h:71
-#, c-format
-msgid "Sorry, you have already reached your limit of %d channels."
-msgstr "%d kanallık limitinizi doldurdunuz."
+#: modules/core/ns_cert.cpp:48
+#, fuzzy, c-format
+msgid "Sorry, you can only have %d certificate entries for a nickname."
+msgstr "Bir nick için sadece %d tane access girilebilir."
 
 #: modules/core/os_stats.cpp:126
 msgid "Statistics reset."
 msgstr "İstatistikler resetlendi."
 
-#: modules/core/ns_update.cpp:38
+#: modules/core/ns_update.cpp:39
 msgid "Status updated (memos, vhost, chmodes, flags)."
 msgstr "Status updated (memos, vhost, chmodes, flags)."
 
@@ -5271,12 +5194,22 @@ msgstr "Flood yapma!"
 msgid "Stop repeating yourself!"
 msgstr "Kendini tekrar etme!"
 
-#: modules/core/cs_set_successor.cpp:69
+#: modules/core/cs_set_securefounder.cpp:21
+#, fuzzy
+msgid "Stricter control of channel founder status"
+msgstr "    SECUREFOUNDER Kanal founderı durumunun sıkı kontrolünü sağlar"
+
+#: modules/core/cs_set_secureops.cpp:21
+#, fuzzy
+msgid "Stricter control of chanop status"
+msgstr "    SECUREOPS     Kanal opu durumunun sıkı kontrolünü sağlar"
+
+#: modules/core/cs_set_successor.cpp:70
 #, c-format
 msgid "Successor for %s unset."
 msgstr "%s için successor kaldırıldı."
 
-#: modules/core/cs_set_successor.cpp:67
+#: modules/core/cs_set_successor.cpp:68
 #, c-format
 msgid "Successor for %s changed to %s."
 msgstr "%s için successor %s olarak değiştirildi."
@@ -5285,21 +5218,36 @@ msgstr "%s için successor %s olarak değiştirildi."
 msgid "SuperAdmin setting not enabled in services.conf"
 msgstr "SuperAdmin setting not enabled in services.conf"
 
-#: modules/core/bs_info.cpp:211
+#: modules/core/ns_suspend.cpp:21
+#, fuzzy
+msgid "Suspend a given nick"
+msgstr "    SUSPEND    Suspend a given nick"
+
+#: modules/core/bs_info.cpp:212
 msgid "Symbiosis"
 msgstr "Gerçek bot"
 
-#: modules/core/bs_set.cpp:150 modules/core/bs_set.cpp:155
+#: modules/core/bs_set.cpp:156
+#, fuzzy, c-format
+msgid "Symbiosis mode is now off on channel %s."
+msgstr "Gerçek bot modu %s kanalında AKTİF."
+
+#: modules/core/bs_set.cpp:151
 #, fuzzy, c-format
-msgid "Symbiosis mode is now  on channel %s."
+msgid "Symbiosis mode is now on on channel %s."
 msgstr "Gerçek bot modu %s kanalında AKTİF."
 
-#: src/language.cpp:129
+#: modules/core/hs_group.cpp:21
+#, fuzzy
+msgid "Syncs the vhost for all nicks in a group"
+msgstr "    GROUP       Syncs the vhost for all nicks in a group"
+
+#: src/language.cpp:119
 #, c-format
 msgid "Syntax: %s"
 msgstr "Kullanımı: %s"
 
-#: modules/core/cs_set_bantype.cpp:46
+#: modules/core/cs_set_bantype.cpp:45
 #, c-format
 msgid ""
 "Syntax: %s channel BANTYPE bantype\n"
@@ -5326,7 +5274,7 @@ msgstr ""
 "2: *!*@host formatında ban için\n"
 "3: *!*user@*.domain formatında ban için"
 
-#: modules/core/cs_set_description.cpp:38
+#: modules/core/cs_set_description.cpp:39
 #, c-format
 msgid ""
 "Syntax: %s channel DESC description\n"
@@ -5339,7 +5287,7 @@ msgstr ""
 "LIST ve INFO komutları kullanıldığında gözükecek kanal \n"
 "açıklamasını belirler."
 
-#: modules/core/cs_set_founder.cpp:74
+#: modules/core/cs_set_founder.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel FOUNDER nick\n"
@@ -5352,7 +5300,7 @@ msgstr ""
 "Kanal founderını değiştirir.  Yeni nickin kayıtlı \n"
 "olması gereklidir."
 
-#: modules/core/cs_set_keeptopic.cpp:47
+#: modules/core/cs_set_keeptopic.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel KEEPTOPIC {ON | OFF}\n"
@@ -5370,7 +5318,7 @@ msgstr ""
 "%s tarafından hatırlanır ve birisi kanala girdiğinde bu\n"
 "topic geçerli olur."
 
-#: modules/core/cs_set_opnotice.cpp:47
+#: modules/core/cs_set_opnotice.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel OPNOTICE {ON | OFF}\n"
@@ -5387,7 +5335,7 @@ msgstr ""
 "üzerinde OP veya DEOP komutlarının kullanıldığını\n"
 "belirten bir mesaj gönderir."
 
-#: modules/core/cs_set_peace.cpp:47
+#: modules/core/cs_set_peace.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel PEACE {ON | OFF}\n"
@@ -5404,7 +5352,7 @@ msgstr ""
 "yüksek veya esit olanlari atamaz, banlayamaz veya %s\n"
 "seviyesini degistiremez."
 
-#: modules/core/cs_set_persist.cpp:105
+#: modules/core/cs_set_persist.cpp:106
 #, c-format
 msgid ""
 "Syntax: %s channel PERSIST {ON | OFF}\n"
@@ -5449,7 +5397,8 @@ msgstr ""
 "Additionally, services will set or unset this mode when you\n"
 "set persist on or off."
 
-#: modules/core/cs_set_private.cpp:47
+#: modules/core/cs_set_private.cpp:48
+#, fuzzy, c-format
 msgid ""
 "Syntax: %s channel PRIVATE {ON | OFF}\n"
 " \n"
@@ -5462,7 +5411,7 @@ msgstr ""
 "Bir kanal için private özelliğini açar kapatır. private özelliği\n"
 "aktifse, /msg %s LIST komutuyla kanal listelenemez."
 
-#: modules/core/cs_set_restricted.cpp:50
+#: modules/core/cs_set_restricted.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel RESTRICTED {ON | OFF}\n"
@@ -5477,7 +5426,7 @@ msgstr ""
 "channel.  When restricted access is set, users not on the access list will\n"
 "instead be kicked and banned from the channel."
 
-#: modules/core/cs_set_secure.cpp:47
+#: modules/core/cs_set_secure.cpp:48
 #, c-format
 msgid ""
 "Syntax: %s channel SECURE {ON | OFF}\n"
@@ -5496,7 +5445,7 @@ msgstr ""
 "alabilirler ve access listesindeki statülerini\n"
 "alabilirler.(mesela op olabilirler)"
 
-#: modules/core/cs_set_securefounder.cpp:54
+#: modules/core/cs_set_securefounder.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SECUREFOUNDER {ON | OFF}\n"
@@ -5516,7 +5465,7 @@ msgstr ""
 "şifresiyle kendilerini %s'e kanal founderı olarak tanıtan \n"
 "ama nicki founderın nicki olmayanlar bu komutları kullanamazlar."
 
-#: modules/core/cs_set_successor.cpp:76
+#: modules/core/cs_set_successor.cpp:77
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s channel SUCCESSOR nick\n"
@@ -5539,7 +5488,23 @@ msgstr ""
 "için bir successor belirtilmemişse kanalın kaydı silinir(drop).\n"
 "Komutta belirtilen nickin kayıtlı olması gereklidir."
 
-#: modules/core/cs_set_xop.cpp:87
+#: modules/core/cs_set_topiclock.cpp:48
+#, fuzzy, c-format
+msgid ""
+"Syntax: %s channel TOPICLOCK {ON | OFF}\n"
+" \n"
+"Enables or disables the topic lock option for a channel.\n"
+"When topic lock is set, %s will not allow the\n"
+"channel topic to be changed except via the TOPIC\n"
+"command."
+msgstr ""
+"Kullanımı: %s kanaladı TOPICLOCK {ON | OFF}\n"
+"\n"
+"Bir kanal için topic kilidini aktifleştirir yada kapatır.\n"
+"topic kilidi aktifse, %s SET TOPIC komutunun\n"
+"dışında kanal topic inin değiştirilmesine izin vermez."
+
+#: modules/core/cs_set_xop.cpp:88
 #, c-format
 msgid ""
 "Syntax: %s channel XOP {ON | OFF}\n"
@@ -5585,8 +5550,8 @@ msgstr ""
 "Bunlarin disinda xOP sisteminden access sistemine geçmek\n"
 "bir problem çikarmaz."
 
-#: modules/core/cs_access.cpp:456
-#, fuzzy
+#: modules/core/cs_access.cpp:463
+#, fuzzy, c-format
 msgid ""
 "Syntax: ACCESS channel ADD mask level\n"
 "        ACCESS channel DEL {mask | entry-num | list}\n"
@@ -5671,7 +5636,7 @@ msgstr ""
 "\n"
 "ACCESS CLEAR komutu tüm access listesini temizler."
 
-#: modules/core/ns_access.cpp:153
+#: modules/core/ns_access.cpp:154
 #, c-format
 msgid ""
 "Syntax: ACCESS ADD mask\n"
@@ -5722,7 +5687,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mevcut access listesini görüntüler."
 
-#: modules/core/bs_act.cpp:67
+#: modules/core/bs_act.cpp:68
 msgid ""
 "Syntax: ACT channel text\n"
 " \n"
@@ -5734,7 +5699,7 @@ msgstr ""
 "Botun belirtilen yazıyla belirtilen kanalda \"/me\" komutunun \n"
 "yaptığını kendi üzerinde yapmasını sağlar."
 
-#: modules/core/ns_ajoin.cpp:96
+#: modules/core/ns_ajoin.cpp:97
 msgid ""
 "Syntax: AJOIN {ADD | DEL | LIST} [channel] [key]\n"
 " \n"
@@ -5754,7 +5719,7 @@ msgid ""
 " \n"
 "Maintains the AutoKick list for a channel.  If a user\n"
 "on the AutoKick list attempts to join the channel,\n"
-"%s will ban that user from the channel, then kick\n"
+"%sS will ban that user from the channel, then kick\n"
 "the user.\n"
 " \n"
 "The AKICK ADD command adds the given nick or usermask\n"
@@ -5778,7 +5743,7 @@ msgid ""
 "The AKICK VIEW command is a more verbose version of\n"
 "AKICK LIST command.\n"
 " \n"
-"The AKICK ENFORCE command causes %s to enforce the\n"
+"The AKICK ENFORCE command causes %sS to enforce the\n"
 "current AKICK list by removing those users who match an\n"
 "AKICK mask.\n"
 " \n"
@@ -5829,7 +5794,7 @@ msgstr ""
 "AKICK CLEAR komutu akick listesinde bulunan tüm kayıtları\n"
 "siler."
 
-#: modules/core/os_akill.cpp:407
+#: modules/core/os_akill.cpp:377
 #, fuzzy
 msgid ""
 "Syntax: AKILL ADD [+expiry] mask reason\n"
@@ -5915,7 +5880,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ns_alist.cpp:139
+#: modules/core/ns_alist.cpp:146
 msgid ""
 "Syntax: ALIST [level]\n"
 " \n"
@@ -5954,7 +5919,7 @@ msgstr ""
 "Channels that have the NOEXPIRE option set will be prefixed by \n"
 "an exclamation mark."
 
-#: modules/core/ns_alist.cpp:131
+#: modules/core/ns_alist.cpp:138
 msgid ""
 "Syntax: ALIST [nickname] [level]\n"
 " \n"
@@ -5971,7 +5936,7 @@ msgstr ""
 "on. With two parameters lists channels that nickname has \n"
 "level access or greater on."
 
-#: modules/core/cs_xop.cpp:481
+#: modules/core/cs_xop.cpp:478
 #, fuzzy
 msgid ""
 "Syntax: AOP channel ADD mask\n"
@@ -6001,17 +5966,6 @@ msgid ""
 "      \n"
 "The AOP CLEAR command clears all entries of the\n"
 "AOP list.\n"
-" \n"
-"The AOP ADD and AOP DEL commands are limited to\n"
-"SOPs or above, while the AOP CLEAR command can only\n"
-"be used by the channel founder. However, any user on the\n"
-"AOP list may use the AOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Kullanımı: AOP kanaladi ADD nick\n"
 "           AOP kanaladi DEL {nick | kayit-no | liste}\n"
@@ -6049,7 +6003,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %s HELP SET XOP yazarak ulasabilirsiniz."
 
-#: modules/core/bs_assign.cpp:71
+#: modules/core/bs_assign.cpp:72
 msgid ""
 "Syntax: ASSIGN chan nick\n"
 " \n"
@@ -6063,8 +6017,8 @@ msgstr ""
 "sonra botun ayarlarını ihtiyaçlarınıza uygun şekilde \n"
 "yapabilirsiniz."
 
-#: modules/core/bs_badwords.cpp:274
-#, fuzzy
+#: modules/core/bs_badwords.cpp:276
+#, fuzzy, c-format
 msgid ""
 "Syntax: BADWORDS channel ADD word [SINGLE | START | END]\n"
 "        BADWORDS channel DEL {word | entry-num | list}\n"
@@ -6085,20 +6039,6 @@ msgid ""
 "word. If you don't specify anything, a kick will\n"
 "be issued every time word is said by a user.\n"
 " \n"
-"The BADWORDS DEL command removes the given word from the\n"
-"bad words list.  If a list of entry numbers is given, those\n"
-"entries are deleted.  (See the example for LIST below.)\n"
-" \n"
-"The BADWORDS LIST command displays the bad words list.  If\n"
-"a wildcard mask is given, only those entries matching the\n"
-"mask are displayed.  If a list of entry numbers is given,\n"
-"only those entries are shown; for example:\n"
-"   BADWORDS #channel LIST 2-5,7-9\n"
-"      Lists bad words entries numbered 2 through 5 and\n"
-"      7 through 9.\n"
-" \n"
-"The BADWORDS CLEAR command clears all entries of the\n"
-"bad words list."
 msgstr ""
 "Kullanımı:  BADWORDS kanaladı ADD kelime [SINGLE | START | END]\n"
 "            BADWORDS kanaladı DEL {kelime | kayıt-no | liste}\n"
@@ -6134,7 +6074,7 @@ msgstr ""
 "      \n"
 "BADWORDS CLEAR komutu tüm küfür listesini temizler."
 
-#: modules/core/cs_ban.cpp:79
+#: modules/core/cs_ban.cpp:80
 msgid ""
 "Syntax: BAN #channel nick [reason]\n"
 " \n"
@@ -6150,7 +6090,7 @@ msgstr ""
 "Varsayilan olarak, AOP larin veya 5. seviyeden access i olanlarin\n"
 "ve üstünün kullanma yetkisi vardir."
 
-#: modules/core/bs_bot.cpp:385
+#: modules/core/bs_bot.cpp:386
 msgid ""
 "Syntax: BOT ADD nick user host real\n"
 "        BOT CHANGE oldnick newnick [user [host [real]]]\n"
@@ -6190,7 +6130,7 @@ msgstr ""
 "kullanırsanız o nickin kaydı silinir(drop). Ayrıca\n"
 "o an bir kuulanıcı bu nicki kullanıyorsa kill lenir."
 
-#: modules/core/bs_botlist.cpp:68
+#: modules/core/bs_botlist.cpp:69
 msgid ""
 "Syntax: BOTLIST\n"
 " \n"
@@ -6200,7 +6140,7 @@ msgstr ""
 "\n"
 "Networkte mevcut olan tüm botları listeler."
 
-#: modules/core/ms_cancel.cpp:59
+#: modules/core/ms_cancel.cpp:60
 msgid ""
 "Syntax: CANCEL {nick | channel}\n"
 " \n"
@@ -6212,7 +6152,21 @@ msgstr ""
 "Belirtilen kanala yada nicke gönderilen son mesajı iptal eder,\n"
 "tabi eğer o mesaj siz komutu kullandığınız sırada okunmamışsa."
 
-#: modules/core/os_chankill.cpp:90
+#: modules/core/ns_cert.cpp:156
+#, c-format
+msgid ""
+"Syntax: CERT ADD [fingerprint]\n"
+"        CERT DEL [<fingerprint>]\n"
+"        CERT LIST\n"
+" \n"
+"Modifies or displays the certificate list for your nick.\n"
+"If you connect to IRC and provide a client certificate with a\n"
+"matching fingerprint in the cert list, your nick will be\n"
+"automatically identified to %s.\n"
+" \n"
+msgstr ""
+
+#: modules/core/os_chankill.cpp:91
 msgid ""
 "Syntax: CHANKILL [+expiry] channel reason\n"
 "Puts an AKILL for every nick on the specified channel. It\n"
@@ -6224,7 +6178,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/core/os_chanlist.cpp:79
+#: modules/core/os_chanlist.cpp:80
 msgid ""
 "Syntax: CHANLIST [{pattern | nick} [SECRET]]\n"
 " \n"
@@ -6247,7 +6201,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ms_check.cpp:71
+#: modules/core/ms_check.cpp:72
 msgid ""
 "Syntax: CHECK nick\n"
 " \n"
@@ -6259,7 +6213,7 @@ msgstr ""
 "Checks whether the _last_ memo you sent to nick has been read\n"
 "or not. Note that this does only work with nicks, not with chans."
 
-#: modules/core/cs_clearusers.cpp:54
+#: modules/core/cs_clearusers.cpp:55
 #, fuzzy, c-format
 msgid ""
 "Syntax: CLEARUSERS channel\n"
@@ -6274,7 +6228,7 @@ msgstr ""
 "\n"
 "Belirtilen kanal founderlarinin kullanma yetkisi vardir."
 
-#: modules/core/cs_clone.cpp:154
+#: modules/core/cs_clone.cpp:155
 msgid ""
 "Syntax: CLONE channel target [all | access | akick | badwords]\n"
 " \n"
@@ -6284,16 +6238,29 @@ msgid ""
 "access to channel and target."
 msgstr ""
 
-#: modules/core/ns_register.cpp:148
+#: modules/core/os_config.cpp:199
+msgid ""
+"Syntax: CONFIG {MODIFY|VIEW} [block name item name item value]\n"
+"\n"
+"CONFIG allows you to change and view configuration settings.\n"
+"Settings changed by this command are temporary and will not be reflected\n"
+"back into the configuration file, and will be lost if Anope is shut down,\n"
+"restarted, or the RELOAD command is used.\n"
+" \n"
+"Example:\n"
+"     CONFIG MODIFY nickserv forcemail no"
+msgstr ""
+
+#: modules/core/ns_register.cpp:67
+#, fuzzy
 msgid ""
 "Syntax: CONFIRM passcode\n"
 " \n"
-"This is the second step of nickname registration process.\n"
-"You must perform this command in order to get your nickname\n"
-"registered with %s. The passcode (or called auth code also)\n"
-"is sent to your e-mail address in the first step of the\n"
-"registration process. For more information about the first\n"
-"stage of the registration process, type: %s%s HELP REGISTER\n"
+"This command is used by several commands as a way to confirm\n"
+"changes made to your account.\n"
+" \n"
+"This is most commonly used to confirm your email address once\n"
+"you register or change it.\n"
 " \n"
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
@@ -6310,7 +6277,7 @@ msgstr ""
 "This is also used after the RESETPASS command has been used to\n"
 "force identify you to your nick so you may change your password."
 
-#: modules/core/os_defcon.cpp:118
+#: modules/core/os_defcon.cpp:126
 msgid ""
 "Syntax: DEFCON [1|2|3|4|5]\n"
 "The defcon system can be used to implement a pre-defined\n"
@@ -6322,7 +6289,7 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: modules/core/cs_modes.cpp:302
+#: modules/core/cs_modes.cpp:283
 #, fuzzy
 msgid ""
 "Syntax: DEHALFOP [#channel] [nick]\n"
@@ -6344,7 +6311,7 @@ msgstr ""
 "olanlar kullanabilir, ayrica HOP lar veya access seviyesi\n"
 "4 ve üzeri olanlar kendi halfoplarını alabilirler."
 
-#: modules/core/hs_del.cpp:48
+#: modules/core/hs_del.cpp:49
 msgid ""
 "Syntax: DEL <nick>\n"
 "Deletes the vhost assigned to the given nick from the\n"
@@ -6354,7 +6321,7 @@ msgstr ""
 "Deletes the vhost assigned to the given nick from the\n"
 "database."
 
-#: modules/core/ms_del.cpp:127
+#: modules/core/ms_del.cpp:128
 #, fuzzy
 msgid ""
 "Syntax: DEL [channel] {num | list | LAST | ALL}\n"
@@ -6390,7 +6357,7 @@ msgstr ""
 "   DEL 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajları siler."
 
-#: modules/core/hs_delall.cpp:53
+#: modules/core/hs_delall.cpp:54
 #, fuzzy
 msgid ""
 "Syntax: DELALL <nick>.\n"
@@ -6401,7 +6368,7 @@ msgstr ""
 "Deletes the vhost for all nick's in the same group as\n"
 "that of the given nick."
 
-#: modules/core/cs_modes.cpp:142
+#: modules/core/cs_modes.cpp:139
 #, fuzzy
 msgid ""
 "Syntax: DEOP [#channel] [nick]\n"
@@ -6421,7 +6388,7 @@ msgstr ""
 "Varsayılan olarak, AOP lar veya access seviyesi 5 ve üzeri\n"
 "olanlar kullanabilir."
 
-#: modules/core/cs_modes.cpp:465
+#: modules/core/cs_modes.cpp:430
 #, fuzzy
 msgid ""
 "Syntax: DEOWNER [#channel] [nick]\n"
@@ -6440,7 +6407,7 @@ msgstr ""
 "Varsayılan olarak, AOP lar veya access seviyesi 5 ve üzeri\n"
 "olanlar kullanabilir."
 
-#: modules/core/cs_modes.cpp:385
+#: modules/core/cs_modes.cpp:358
 #, fuzzy
 msgid ""
 "Syntax: DEPROTECT [#channel] [nick]\n"
@@ -6459,7 +6426,7 @@ msgstr ""
 "Varsayılan olarak, founder kullanabilir, veya SOP lar ile\n"
 "access seviyesi 10 ve üzeri olanlar kendilerinde kullanabilir."
 
-#: modules/core/cs_modes.cpp:219
+#: modules/core/cs_modes.cpp:208
 #, fuzzy
 msgid ""
 "Syntax: DEVOICE [#channel] [nick]\n"
@@ -6481,7 +6448,7 @@ msgstr ""
 "kullanabilir, veya VOP lar ile access seviyesi 3 ve üzeri olanlar\n"
 "kendilerini devoice etmek için kullanabilirler."
 
-#: modules/core/cs_drop.cpp:90
+#: modules/core/cs_drop.cpp:91
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6492,7 +6459,7 @@ msgstr ""
 "\n"
 "Kanalın kaydını siler."
 
-#: modules/core/cs_drop.cpp:85
+#: modules/core/cs_drop.cpp:86
 msgid ""
 "Syntax: DROP channel\n"
 " \n"
@@ -6504,8 +6471,8 @@ msgstr ""
 "Belirtilen kanalın kaydını siler. Sadece Servis adminleri\n"
 "kanalı tanıtmadan kaydını silebilirler."
 
-#: modules/core/ns_drop.cpp:131
-#, fuzzy
+#: modules/core/ns_drop.cpp:104
+#, fuzzy, c-format
 msgid ""
 "Syntax: DROP [nickname | password]\n"
 " \n"
@@ -6534,7 +6501,7 @@ msgstr ""
 "gereklidir (Daha fazla bilgi için /msg %s HELP IDENTIFY \n"
 "yazın)."
 
-#: modules/core/ns_drop.cpp:121
+#: modules/core/ns_drop.cpp:94
 #, c-format
 msgid ""
 "Syntax: DROP [nickname]\n"
@@ -6556,7 +6523,7 @@ msgstr ""
 "gerek olmadan silebilirsiniz. Bu işlemler Servis adminleri \n"
 "tarafından yapılabilir."
 
-#: modules/core/os_session.cpp:456
+#: modules/core/os_session.cpp:468
 #, fuzzy, c-format
 msgid ""
 "Syntax: EXCEPTION ADD [+expiry] mask limit reason\n"
@@ -6639,7 +6606,7 @@ msgstr ""
 "\n"
 "Servis adminleri tarafından kullanılabilir."
 
-#: modules/core/cs_forbid.cpp:100
+#: modules/core/cs_forbid.cpp:99
 msgid ""
 "Syntax: FORBID channel [reason]\n"
 " \n"
@@ -6657,7 +6624,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ns_forbid.cpp:89
+#: modules/core/ns_forbid.cpp:87
 msgid ""
 "Syntax: FORBID nickname [reason]\n"
 " \n"
@@ -6675,7 +6642,7 @@ msgstr ""
 "\n"
 "Sadece Servis adminleri tarafından kullanılır."
 
-#: modules/core/ns_getemail.cpp:57
+#: modules/core/ns_getemail.cpp:58
 msgid ""
 "Syntax: GETEMAIL user@emailhost\n"
 "Returns the matching nicks that used given email. Note that\n"
@@ -6689,7 +6656,7 @@ msgstr ""
 "this command is used, a message including the person who issued\n"
 "the command and the email it was used on will be logged."
 
-#: modules/core/cs_getkey.cpp:52
+#: modules/core/cs_getkey.cpp:53
 msgid ""
 "Syntax: GETKEY channel\n"
 " \n"
@@ -6699,7 +6666,7 @@ msgstr ""
 "\n"
 "Belirtilen kanalın anahtarını söyler."
 
-#: modules/core/ns_getpass.cpp:64
+#: modules/core/ns_getpass.cpp:52
 #, fuzzy
 msgid ""
 "Syntax: GETPASS nickname\n"
@@ -6719,7 +6686,7 @@ msgstr ""
 "\n"
 "(Bu komut şifreleme(encryption) aktif olduğu zaman devre dışıdır.)"
 
-#: modules/core/ns_ghost.cpp:72
+#: modules/core/ns_ghost.cpp:74
 #, fuzzy
 msgid ""
 "Syntax: GHOST nickname [password]\n"
@@ -6749,7 +6716,7 @@ msgstr ""
 "o nick için doğru şifrenin belirtilmiş olması yada o nickin\n"
 "grubundaki başka bir nickin tanıtılmış olması gerekir."
 
-#: modules/core/ns_group.cpp:296
+#: modules/core/ns_group.cpp:293
 msgid ""
 "Syntax: GLIST\n"
 " \n"
@@ -6759,7 +6726,7 @@ msgstr ""
 "\n"
 "Lists all nicks in your group."
 
-#: modules/core/ns_group.cpp:287
+#: modules/core/ns_group.cpp:284
 msgid ""
 "Syntax: GLIST [nickname]\n"
 " \n"
@@ -6791,7 +6758,7 @@ msgstr ""
 "IRCopların networkteki tüm kullanıcılara mesaj yollamasını\n"
 "sağlar. Mesajlar %s nickinden gönderilir."
 
-#: modules/core/hs_group.cpp:43
+#: modules/core/hs_group.cpp:44
 msgid ""
 "Syntax: GROUP\n"
 " \n"
@@ -6805,7 +6772,8 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: modules/core/ns_group.cpp:138
+#: modules/core/ns_group.cpp:142
+#, fuzzy, c-format
 msgid ""
 "Syntax: GROUP target password\n"
 " \n"
@@ -6867,7 +6835,7 @@ msgstr ""
 "\n"
 "Not: bir gruptaki tüm nickler bir şifreye sahip olurlar."
 
-#: modules/core/cs_modes.cpp:261
+#: modules/core/cs_modes.cpp:246
 #, fuzzy
 msgid ""
 "Syntax: HALFOP [#channel] [nick]\n"
@@ -6888,7 +6856,7 @@ msgstr ""
 "olanlar kullanabilir, veya HOP lar ile access seviyesi 4 ve\n"
 "üzeri olanlar kendilerini halfop yapmak için kullanabilir."
 
-#: modules/core/cs_xop.cpp:548
+#: modules/core/cs_xop.cpp:540
 #, fuzzy
 msgid ""
 "Syntax: HOP channel ADD mask\n"
@@ -6917,16 +6885,6 @@ msgid ""
 "      \n"
 "The HOP CLEAR command clears all entries of the\n"
 "HOP list.\n"
-" \n"
-"The HOP ADD, HOP DEL and HOP LIST commands are \n"
-"limited to AOPs or above, while the HOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Kullanımı: HOP kanaladi ADD nick\n"
 "           HOP kanaladi DEL {nick | kayit-no | liste}\n"
@@ -6961,7 +6919,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %s HELP SET XOP yazarak ulasabilirsiniz."
 
-#: modules/core/ns_identify.cpp:107
+#: modules/core/ns_identify.cpp:72
 #, c-format
 msgid ""
 "Syntax: IDENTIFY [account] password\n"
@@ -6979,7 +6937,7 @@ msgstr ""
 "tanıtılmanızı gerektirir. Şifreniz nickinizi kayıt ederken \n"
 "REGISTER komutuyla beraber kullandığınızla aynıdır."
 
-#: modules/core/ms_ignore.cpp:90
+#: modules/core/ms_ignore.cpp:91
 msgid ""
 "Syntax: IGNORE [channek] {ADD|DEL|LIST} [entry]\n"
 " \n"
@@ -6989,7 +6947,7 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: modules/core/os_ignore.cpp:260
+#: modules/core/os_ignore.cpp:261
 #, fuzzy
 msgid ""
 "Syntax: IGNORE {ADD|DEL|LIST|CLEAR} [time] [nick] [reason]\n"
@@ -7022,7 +6980,7 @@ msgstr ""
 "\n"
 "Ignores will not be enforced on IRC Operators."
 
-#: modules/core/cs_info.cpp:118
+#: modules/core/cs_info.cpp:117
 msgid ""
 "Syntax: INFO channel\n"
 " \n"
@@ -7042,7 +7000,7 @@ msgstr ""
 "giriş mesajı ve successor hakkındada bilgi alabilirsiniz.\n"
 "Varsayilan olarak, ALL seçenegini founderlar kullanabilir."
 
-#: modules/core/ns_info.cpp:151
+#: modules/core/ns_info.cpp:153
 msgid ""
 "Syntax: INFO nickname\n"
 " \n"
@@ -7058,7 +7016,7 @@ msgstr ""
 "ALL parametresini kullandığınızda bilgiler gizli olsa bile o \n"
 "nick hakkındaki tüm bilgiler görünür."
 
-#: modules/core/ms_info.cpp:205
+#: modules/core/ms_info.cpp:206
 msgid ""
 "Syntax: INFO [channel]\n"
 " \n"
@@ -7074,7 +7032,7 @@ msgstr ""
 "Eğer kanaladı parametresi belirtilirse aynı bilgiyi o kanal\n"
 "için gösterir."
 
-#: modules/core/ms_info.cpp:193
+#: modules/core/ms_info.cpp:194
 msgid ""
 "Syntax: INFO [nick | channel]\n"
 "Without a parameter, displays information on the number of\n"
@@ -7100,7 +7058,7 @@ msgstr ""
 "Nick parametresiyle, aynı bilgiyi belirtilen nick için\n"
 "verir. Kullanımı Servis adminleriyle sınırlıdır."
 
-#: modules/core/bs_info.cpp:223
+#: modules/core/bs_info.cpp:224
 #, c-format
 msgid ""
 "Syntax: INFO {chan | nick}\n"
@@ -7118,7 +7076,7 @@ msgstr ""
 "alırsınız. Eğer parametre nickse, bot hakkında yaratılma \n"
 "zamanı veya bulunduğu kanal sayısı gibi bilgiler alırsınız."
 
-#: modules/core/cs_invite.cpp:73
+#: modules/core/cs_invite.cpp:74
 #, fuzzy, c-format
 msgid ""
 "Syntax: INVITE channel\n"
@@ -7160,7 +7118,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/cs_kick.cpp:65
+#: modules/core/cs_kick.cpp:66
 msgid ""
 "Syntax: KICK #channel nick [reason]\n"
 " \n"
@@ -7176,7 +7134,8 @@ msgstr ""
 "Varsayılan olarak, AOP lar ile access seviyesi 5 ve üzeri\n"
 "olanlar bu komutu kullanabilir."
 
-#: modules/core/bs_kick.cpp:437
+#: modules/core/bs_kick.cpp:484
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK #channel BADWORDS {ON|OFF} [ttb]\n"
 "Sets the bad words kicker on or off. When enabled, this\n"
@@ -7201,7 +7160,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:484
+#: modules/core/bs_kick.cpp:531
 msgid ""
 "Syntax: KICK #channel REPEAT {ON|OFF} [ttb [num]]\n"
 "Sets the repeat kicker on or off. When enabled, this\n"
@@ -7222,8 +7181,8 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:415
-#, fuzzy
+#: modules/core/bs_kick.cpp:462
+#, fuzzy, c-format
 msgid ""
 "Syntax: KICK channel option parameters\n"
 " \n"
@@ -7289,7 +7248,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/bs_kick.cpp:514
+#: modules/core/bs_kick.cpp:561
 #, fuzzy
 msgid ""
 "Syntax: KICK channel AMSGS {ON|OFF} [ttb]\n"
@@ -7307,7 +7266,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:448
+#: modules/core/bs_kick.cpp:495
 msgid ""
 "Syntax: KICK channel BOLDS {ON|OFF} [ttb]\n"
 "Sets the bolds kicker on or off. When enabled, this\n"
@@ -7325,7 +7284,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:455
+#: modules/core/bs_kick.cpp:502
 #, c-format
 msgid ""
 "Syntax: KICK channel CAPS {ON|OFF} [ttb [min [percent]]]\n"
@@ -7353,7 +7312,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:467
+#: modules/core/bs_kick.cpp:514
 msgid ""
 "Syntax: KICK channel COLORS {ON|OFF} [ttb]\n"
 "Sets the colors kicker on or off. When enabled, this\n"
@@ -7371,7 +7330,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:474
+#: modules/core/bs_kick.cpp:521
 msgid ""
 "Syntax: KICK channel FLOOD {ON|OFF} [ttb [ln [secs]]]\n"
 "Sets the flood kicker on or off. When enabled, this\n"
@@ -7393,7 +7352,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:507
+#: modules/core/bs_kick.cpp:554
 msgid ""
 "Syntax: KICK channel ITALICS {ON|OFF} [ttb]\n"
 "Sets the italics kicker on or off. When enabled, this\n"
@@ -7409,7 +7368,7 @@ msgstr ""
 "before it get banned. Don't give ttb to disable\n"
 "the ban system once activated."
 
-#: modules/core/bs_kick.cpp:493
+#: modules/core/bs_kick.cpp:540
 msgid ""
 "Syntax: KICK channel REVERSES {ON|OFF} [ttb]\n"
 "Sets the reverses kicker on or off. When enabled, this\n"
@@ -7427,7 +7386,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/bs_kick.cpp:500
+#: modules/core/bs_kick.cpp:547
 msgid ""
 "Syntax: KICK channel UNDERLINES {ON|OFF} [ttb]\n"
 "Sets the underlines kicker on or off. When enabled, this\n"
@@ -7445,7 +7404,7 @@ msgstr ""
 "böas banlamadan önce kişinin kaç kez atılacağını \n"
 "belirler. Kaldırmak için komutta böas ı belirtmeyin."
 
-#: modules/core/cs_access.cpp:712
+#: modules/core/cs_access.cpp:726
 #, fuzzy, c-format
 msgid ""
 "Syntax: LEVELS channel SET type level\n"
@@ -7498,7 +7457,7 @@ msgstr ""
 "For a list of the features and functions whose levels can be\n"
 "set, see HELP LEVELS DESC."
 
-#: modules/core/hs_list.cpp:102
+#: modules/core/hs_list.cpp:107
 msgid ""
 "Syntax: LIST [<key>|<#X-Y>]\n"
 "This command lists registered vhosts to the operator\n"
@@ -7522,7 +7481,7 @@ msgstr ""
 "The list uses the value of NSListMax as a hard limit for the\n"
 "number of items to display to a operator at any 1 time."
 
-#: modules/core/cs_list.cpp:126
+#: modules/core/cs_list.cpp:125
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7536,7 +7495,7 @@ msgstr ""
 "Belirtilen modelle uyuşan tüm kayıtlı kanalları listeler.\n"
 "(PRIVATE özelliği aktif olan kanallar listelenmez.)"
 
-#: modules/core/ns_list.cpp:203
+#: modules/core/ns_list.cpp:180
 msgid ""
 "Syntax: LIST pattern\n"
 " \n"
@@ -7576,7 +7535,7 @@ msgstr ""
 "    LIST *!*@*.ixir.com\n"
 "        ixir.com domainine sahip tüm kayıtlı nickleri listeler."
 
-#: modules/core/ns_list.cpp:178
+#: modules/core/ns_list.cpp:155
 #, fuzzy
 msgid ""
 "Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]\n"
@@ -7634,7 +7593,7 @@ msgstr ""
 "    LIST * NOEXPIRE\n"
 "        Zaman asimi olmayan tüm kayıtlı nickler listelenir."
 
-#: modules/core/ms_list.cpp:147
+#: modules/core/ms_list.cpp:148
 #, fuzzy
 msgid ""
 "Syntax: LIST [channel] [list | NEW]\n"
@@ -7656,11 +7615,21 @@ msgstr ""
 "   LIST 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajları listeler."
 
+#: modules/core/os_login.cpp:54
+#, c-format
+msgid ""
+"Syntax: LOGIN password\n"
+" \n"
+"Logs you in to %s so you gain Services Operator privileges.\n"
+"This command may be unnecessary if your oper block is\n"
+"configured without a password."
+msgstr ""
+
 #: modules/core/os_news.cpp:39
 msgid "Syntax: LOGONNEWS ADD text"
 msgstr "Kullanımı: LOGONNEWS ADD yazı"
 
-#: modules/core/os_news.cpp:302
+#: modules/core/os_news.cpp:307
 #, c-format
 msgid ""
 "Syntax: LOGONNEWS ADD text\n"
@@ -7693,7 +7662,7 @@ msgstr ""
 msgid "Syntax: LOGONNEWS DEL {num | ALL}"
 msgstr "Kullanımı: LOGONNEWS DEL {num | ALL}"
 
-#: modules/core/ns_logout.cpp:78
+#: modules/core/ns_logout.cpp:79
 msgid ""
 "Syntax: LOGOUT\n"
 " \n"
@@ -7709,7 +7678,7 @@ msgstr ""
 "sağlar. Fakat sizden nickinizi tekrar identify etmeniz \n"
 "istenmez."
 
-#: modules/core/ns_logout.cpp:67
+#: modules/core/ns_logout.cpp:68
 msgid ""
 "Syntax: LOGOUT [nickname [REVALIDATE]]\n"
 " \n"
@@ -7734,24 +7703,7 @@ msgstr ""
 "identify etmesini söyler. Servis adminlerinin Kullanımıyla\n"
 "sınırlıdır."
 
-#: modules/core/os_mode.cpp:46
-#, fuzzy
-msgid ""
-"Syntax: MODE channel modes\n"
-" \n"
-"Allows Services operators to set channel modes for any\n"
-"channel. Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Kullanımı: MODE kanaladı modlar\n"
-"\n"
-"Servis operatörlerinin herhangi bir kanalın modlarını\n"
-"ayarlamasını sağlar. Parametreler standart /MODE komutununkiyle\n"
-"aynıdır.\n"
-"\n"
-"Servis operatörlerinin Kullanımıyla sınırlıdır."
-
-#: modules/core/cs_mode.cpp:283
+#: modules/core/cs_mode.cpp:331
 msgid ""
 "Syntax: MODE channel LOCK {ADD|DEL|LIST} [what]\n"
 "        MODE channel SET modes\n"
@@ -7778,7 +7730,24 @@ msgid ""
 "       Clears all extended bans that start with ~c:"
 msgstr ""
 
-#: modules/core/os_modinfo.cpp:69
+#: modules/core/os_mode.cpp:65
+#, fuzzy
+msgid ""
+"Syntax: MODE {channel|user} modes\n"
+" \n"
+"Allows Services operators to change modes for any channel or\n"
+"user. Parameters are the same as for the standard /MODE\n"
+"command."
+msgstr ""
+"Kullanımı: MODE kanaladı modlar\n"
+"\n"
+"Servis operatörlerinin herhangi bir kanalın modlarını\n"
+"ayarlamasını sağlar. Parametreler standart /MODE komutununkiyle\n"
+"aynıdır.\n"
+"\n"
+"Servis operatörlerinin Kullanımıyla sınırlıdır."
+
+#: modules/core/os_modinfo.cpp:70
 msgid ""
 "Syntax: MODINFO FileName\n"
 " \n"
@@ -7787,7 +7756,7 @@ msgstr ""
 "Syntax: MODINFO FileName\n"
 "This command lists information about the specified loaded module"
 
-#: modules/core/os_modlist.cpp:210
+#: modules/core/os_modlist.cpp:211
 msgid ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 " \n"
@@ -7796,7 +7765,7 @@ msgstr ""
 "Syntax: MODLIST [Core|3rd|protocol|encryption|supported|qatested]\n"
 "Lists all currently loaded modules."
 
-#: modules/core/os_modload.cpp:56
+#: modules/core/os_modload.cpp:57
 msgid ""
 "Syntax: MODLOAD FileName\n"
 " \n"
@@ -7807,7 +7776,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modreload.cpp:83
+#: modules/core/os_modreload.cpp:84
 #, fuzzy
 msgid ""
 "Syntax: MODRELOAD FileName\n"
@@ -7818,7 +7787,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_modunload.cpp:64
+#: modules/core/os_modunload.cpp:65
 msgid ""
 "Syntax: MODUNLOAD FileName\n"
 " \n"
@@ -7829,7 +7798,7 @@ msgstr ""
 "This command unloads the module named FileName from the modules\n"
 "directory."
 
-#: modules/core/os_noop.cpp:64
+#: modules/core/os_noop.cpp:63
 #, fuzzy
 msgid ""
 "Syntax: NOOP SET server\n"
@@ -7859,7 +7828,7 @@ msgstr ""
 "\n"
 "Services Operatorlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/hs_off.cpp:42
+#: modules/core/hs_off.cpp:43
 msgid ""
 "Syntax: OFF\n"
 "Deactivates the vhost currently assigned to the nick in use.\n"
@@ -7871,7 +7840,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see your real IP address."
 
-#: modules/core/os_oline.cpp:55
+#: modules/core/os_oline.cpp:56
 msgid ""
 "Syntax: OLINE user flags\n"
 " \n"
@@ -7885,7 +7854,7 @@ msgstr ""
 "Flags have to be prefixed with a \"+\" or a \"-\". To\n"
 "remove all flags simply type a \"-\" instead of any flags."
 
-#: modules/core/hs_on.cpp:52
+#: modules/core/hs_on.cpp:53
 msgid ""
 "Syntax: ON\n"
 "Activates the vhost currently assigned to the nick in use.\n"
@@ -7897,7 +7866,7 @@ msgstr ""
 "When you use this command any user who performs a /whois\n"
 "on you will see the vhost instead of your real IP address."
 
-#: modules/core/cs_modes.cpp:104
+#: modules/core/cs_modes.cpp:105
 #, fuzzy
 msgid ""
 "Syntax: OP [#channel] [nick]\n"
@@ -7921,7 +7890,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS ADD text"
 msgstr "Kullanımı: OPERNEWS ADD yazı"
 
-#: modules/core/os_news.cpp:342
+#: modules/core/os_news.cpp:343
 #, c-format
 msgid ""
 "Syntax: OPERNEWS ADD text\n"
@@ -7954,7 +7923,7 @@ msgstr ""
 msgid "Syntax: OPERNEWS DEL {num | ALL}"
 msgstr "Kullanımı: OPERNEWS DEL {num | ALL}"
 
-#: modules/core/cs_modes.cpp:425
+#: modules/core/cs_modes.cpp:394
 #, fuzzy
 msgid ""
 "Syntax: OWNER [#channel] [nick]\n"
@@ -7973,7 +7942,7 @@ msgstr ""
 "Varsayılan olarak, AOP lar ile access seviyesi 5 ve üzeri\n"
 "olanlar kullanabilir."
 
-#: modules/core/cs_modes.cpp:344
+#: modules/core/cs_modes.cpp:321
 #, fuzzy
 msgid ""
 "Syntax: PROTECT [#channel] [nick]\n"
@@ -7993,7 +7962,7 @@ msgstr ""
 "Varsayılan olarak, founder kullanabilir, veya SOP lar ile access\n"
 "seviyesi 10 ve üzeri olanlar kendilerinde kullanabilirler."
 
-#: modules/core/cs_xop.cpp:417
+#: modules/core/cs_xop.cpp:416
 #, fuzzy
 msgid ""
 "Syntax: QOP channel ADD mask\n"
@@ -8022,16 +7991,6 @@ msgid ""
 "      \n"
 "The QOP CLEAR command clears all entries of the\n"
 "QOP list.\n"
-" \n"
-"The QOP commands are limited to\n"
-"founders (unless SECUREOPS is off). However, any user on the\n"
-"QOP list may use the QOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Syntax: QOP channel ADD nick\n"
 "        QOP channel DEL {nick | entry-num | list}\n"
@@ -8070,7 +8029,7 @@ msgstr ""
 "and /msg %s HELP SET XOP to know how to toggle between \n"
 "the access list and xOP list systems."
 
-#: modules/core/os_quit.cpp:37
+#: modules/core/os_quit.cpp:38
 msgid ""
 "Syntax: QUIT\n"
 " \n"
@@ -8094,7 +8053,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS ADD text"
 msgstr "Kullanımı: RANDOMNEWS ADD yazi"
 
-#: modules/core/os_news.cpp:382
+#: modules/core/os_news.cpp:379
 msgid ""
 "Syntax: RANDOMNEWS ADD text\n"
 "        RANDOMNEWS DEL {num | ALL}\n"
@@ -8120,7 +8079,7 @@ msgstr ""
 msgid "Syntax: RANDOMNEWS DEL {num | ALL}"
 msgstr "Kullanımı: RANDOMNEWS DEL {no | ALL}"
 
-#: modules/core/ms_read.cpp:130
+#: modules/core/ms_read.cpp:131
 #, fuzzy
 msgid ""
 "Syntax: READ [channel] {num | list | LAST | NEW}\n"
@@ -8145,7 +8104,8 @@ msgstr ""
 "   READ 2-5,7-9\n"
 "      2'den 5'e ve 7'den 9'a kadar olan mesajları gösterir."
 
-#: modules/core/ns_recover.cpp:91
+#: modules/core/ns_recover.cpp:93
+#, fuzzy, c-format
 msgid ""
 "Syntax: RECOVER nickname [password]\n"
 " \n"
@@ -8193,8 +8153,8 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/cs_register.cpp:101
-#, fuzzy
+#: modules/core/cs_register.cpp:100
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER channel description\n"
 " \n"
@@ -8236,8 +8196,8 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/core/ns_register.cpp:313
-#, fuzzy
+#: modules/core/ns_register.cpp:218
+#, fuzzy, c-format
 msgid ""
 "Syntax: REGISTER password [email]\n"
 " \n"
@@ -8306,7 +8266,7 @@ msgstr ""
 "sağlar. Bu özellik hakkında daha fazla bilgi için, \n"
 "/msg %s HELP GROUP yazın."
 
-#: modules/core/ns_release.cpp:77
+#: modules/core/ns_release.cpp:79
 #, fuzzy, c-format
 msgid ""
 "Syntax: RELEASE nickname [password]\n"
@@ -8335,7 +8295,7 @@ msgstr ""
 "that nick, or you must supply the correct password for\n"
 "the nickname."
 
-#: modules/core/os_reload.cpp:43
+#: modules/core/os_reload.cpp:45
 msgid ""
 "Syntax: RELOAD\n"
 "Causes Services to reload the configuration file. Note that\n"
@@ -8352,7 +8312,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ns_register.cpp:400
+#: modules/core/ns_register.cpp:303
 msgid ""
 "Syntax: RESEND\n"
 " \n"
@@ -8364,7 +8324,7 @@ msgstr ""
 "This command will re-send the auth code (also called passcode)\n"
 "to the e-mail address of the user whom is performing it."
 
-#: modules/core/ns_resetpass.cpp:51
+#: modules/core/ns_resetpass.cpp:52
 msgid ""
 "Syntax: RESETPASS nickname\n"
 "Sends a code key to the nickname with instructions on how to\n"
@@ -8389,7 +8349,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır.\t"
 
-#: modules/core/ms_rsend.cpp:61
+#: modules/core/ms_rsend.cpp:62
 #, fuzzy
 msgid ""
 "Syntax: RSEND {nick | channel} memo-text\n"
@@ -8412,7 +8372,7 @@ msgstr ""
 "memo will be sent to the sender informing him/her that the memo\n"
 "has been read."
 
-#: modules/core/ns_saset.cpp:77
+#: modules/core/ns_saset.cpp:78
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname option parameters.\n"
@@ -8423,7 +8383,7 @@ msgstr ""
 "\n"
 "Sets various nickname options.  option can be one of:"
 
-#: modules/core/ns_set_autoop.cpp:77
+#: modules/core/ns_set_autoop.cpp:73
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname AUTOOP {ON | OFF}\n"
@@ -8438,7 +8398,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/core/ns_saset.cpp:159
+#: modules/core/ns_saset.cpp:156
 msgid ""
 "Syntax: SASET nickname DISPLAY new-display\n"
 " \n"
@@ -8450,7 +8410,7 @@ msgstr ""
 "Changes the display used to refer to the nickname group in \n"
 "Services. The new display MUST be a nick of the group."
 
-#: modules/core/ns_set_email.cpp:88
+#: modules/core/ns_set_email.cpp:124
 msgid ""
 "Syntax: SASET nickname EMAIL address\n"
 " \n"
@@ -8460,7 +8420,7 @@ msgstr ""
 "\n"
 "Associates the given E-mail address with the nickname."
 
-#: modules/core/ns_set_greet.cpp:72
+#: modules/core/ns_set_greet.cpp:68
 msgid ""
 "Syntax: SASET nickname GREET message\n"
 " \n"
@@ -8476,7 +8436,7 @@ msgstr ""
 "option enabled, provided that the user has the necessary \n"
 "access on it."
 
-#: modules/core/ns_set_hide.cpp:116
+#: modules/core/ns_set_hide.cpp:112
 #, c-format
 msgid ""
 "Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -8499,7 +8459,7 @@ msgstr ""
 "The second parameter specifies whether the information should\n"
 "be displayed (OFF) or hidden (ON)."
 
-#: modules/core/ns_set_kill.cpp:111
+#: modules/core/ns_set_kill.cpp:107
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}\n"
@@ -8532,24 +8492,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/core/ns_set_language.cpp:112
-#, fuzzy
-msgid ""
-"Syntax: SASET nickname LANGUAGE language\n"
-" \n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"language should be chosen from a list of supported languages\n"
-"that you can get by typing %s%s HELP SET LANGUAGE."
-msgstr ""
-"Syntax: SASET nickname LANGUAGE number\n"
-"\n"
-"Changes the language Services uses when sending messages to\n"
-"nickname (for example, when responding to a command he sends).\n"
-"number should be chosen from a list of supported languages\n"
-"that you can get by typing /msg %s HELP SET LANGUAGE."
-
-#: modules/core/ns_set_message.cpp:84
+#: modules/core/ns_set_message.cpp:80
 msgid ""
 "Syntax: SASET nickname MSG {ON | OFF}\n"
 " \n"
@@ -8563,7 +8506,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/core/ns_saset_noexpire.cpp:49
+#: modules/core/ns_saset_noexpire.cpp:50
 msgid ""
 "Syntax: SASET nickname NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8575,7 +8518,7 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
-#: modules/core/ns_saset.cpp:232
+#: modules/core/ns_saset.cpp:222
 #, fuzzy
 msgid ""
 "Syntax: SASET nickname PASSWORD new-password\n"
@@ -8586,7 +8529,7 @@ msgstr ""
 "\n"
 "Changes the password used to identify as the nick's\towner."
 
-#: modules/core/ns_set_private.cpp:80
+#: modules/core/ns_set_private.cpp:77
 #, c-format
 msgid ""
 "Syntax: SASET nickname PRIVATE {ON | OFF}\n"
@@ -8605,7 +8548,7 @@ msgstr ""
 "(However, anyone who knows the nickname can still get\n"
 "information on it using the INFO command.)"
 
-#: modules/core/ns_set_secure.cpp:82
+#: modules/core/ns_set_secure.cpp:78
 #, fuzzy, c-format
 msgid ""
 "Syntax: SASET nickname SECURE {ON | OFF}\n"
@@ -8628,7 +8571,7 @@ msgstr ""
 "will not auto-kill you regardless of the setting of the\n"
 "KILL option."
 
-#: modules/core/bs_say.cpp:65
+#: modules/core/bs_say.cpp:66
 msgid ""
 "Syntax: SAY channel text\n"
 " \n"
@@ -8638,7 +8581,7 @@ msgstr ""
 "\n"
 "Botun belirtilen yazıyı belirtilen kanalda söylemesini sağlar."
 
-#: modules/core/ms_send.cpp:33
+#: modules/core/ms_send.cpp:34
 #, fuzzy
 msgid ""
 "Syntax: SEND {nick | channel} memo-text\n"
@@ -8654,7 +8597,7 @@ msgstr ""
 "Nicke gönderirken, gönderilen kişi yeni mesajı olduğuna dair\n"
 "bir not alır. Mesaj gönderilen nick/kanal kayıtlı olmalıdır."
 
-#: modules/core/ms_sendall.cpp:50
+#: modules/core/ms_sendall.cpp:51
 #, fuzzy
 msgid ""
 "Syntax: SENDALL memo-text\n"
@@ -8664,7 +8607,7 @@ msgstr ""
 "Syntax: SENDALL memo-text\n"
 "Sends all registered users a memo containing memo-text."
 
-#: modules/core/ns_sendpass.cpp:58
+#: modules/core/ns_sendpass.cpp:59
 msgid ""
 "Syntax: SENDPASS nickname\n"
 " \n"
@@ -8681,7 +8624,7 @@ msgstr ""
 "\n"
 "Bazı networklerde sadece IRC operatörleri kullanabilir."
 
-#: modules/core/os_session.cpp:191
+#: modules/core/os_session.cpp:197
 msgid ""
 "Syntax: SESSION LIST threshold\n"
 "        SESSION VIEW host\n"
@@ -8717,7 +8660,7 @@ msgstr ""
 "\n"
 "Servis adminleri tarafından kullanılabilir."
 
-#: modules/core/hs_set.cpp:100
+#: modules/core/hs_set.cpp:101
 msgid ""
 "Syntax: SET <nick> <hostmask>.\n"
 "Sets the vhost for the given nick to that of the given\n"
@@ -8731,7 +8674,7 @@ msgstr ""
 "SET <nick> <ident>@<hostmask> set idents for users as \n"
 "well as vhosts."
 
-#: modules/core/cs_set_secureops.cpp:47
+#: modules/core/cs_set_secureops.cpp:48
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SECUREOPS {ON | OFF}\n"
@@ -8746,8 +8689,8 @@ msgstr ""
 "güvenli op özelliği aktifse, access listesinde olmayan\n"
 "kullanıcılar kanalda op olamazlar."
 
-#: modules/core/cs_set_signkick.cpp:56
-#, fuzzy
+#: modules/core/cs_set_signkick.cpp:57
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET %s SIGNKICK {ON | LEVEL | OFF}\n"
 " \n"
@@ -8772,25 +8715,9 @@ msgstr ""
 "atmalarda atanın nicki sebepte gözükmez. Daha fazla\n"
 "bilgi için /msg %s HELP LEVELS yazın."
 
-#: modules/core/cs_set_topiclock.cpp:47
+#: modules/core/bs_set.cpp:205
 #, fuzzy, c-format
 msgid ""
-"Syntax: SET %s TOPICLOCK {ON | OFF}\n"
-" \n"
-"Enables or disables the topic lock option for a channel.\n"
-"When topic lock is set, %s will not allow the\n"
-"channel topic to be changed except via the TOPIC\n"
-"command."
-msgstr ""
-"Kullanımı: %s kanaladı TOPICLOCK {ON | OFF}\n"
-"\n"
-"Bir kanal için topic kilidini aktifleştirir yada kapatır.\n"
-"topic kilidi aktifse, %s SET TOPIC komutunun\n"
-"dışında kanal topic inin değiştirilmesine izin vermez."
-
-#: modules/core/bs_set.cpp:204
-#, fuzzy
-msgid ""
 "Syntax: SET (channel | bot) option parameters\n"
 " \n"
 "Configures bot options.  option can be one of:\n"
@@ -8822,7 +8749,7 @@ msgstr ""
 "\n"
 "Not: Bu komuta access erişimi seviye(level) ayarıyla sağlanır."
 
-#: modules/core/bs_set.cpp:276
+#: modules/core/bs_set.cpp:277
 msgid ""
 "Syntax: SET bot-nick PRIVATE {ON|OFF}\n"
 "This option prevents a bot from being assigned to a\n"
@@ -8835,7 +8762,7 @@ msgstr ""
 "\n"
 "Bu komutu Servis Adminleri kullanabilir."
 
-#: modules/core/cs_set.cpp:76
+#: modules/core/cs_set.cpp:77
 msgid ""
 "Syntax: SET channel option parameters\n"
 " \n"
@@ -8851,7 +8778,7 @@ msgstr ""
 "\n"
 "Mevcut özellikler:"
 
-#: modules/core/bs_set.cpp:229
+#: modules/core/bs_set.cpp:230
 msgid ""
 "Syntax: SET channel DONTKICKOPS {ON|OFF}\n"
 " \n"
@@ -8865,7 +8792,7 @@ msgstr ""
 "Aktifleştirildiği zaman, oplar bot tarafında NOKICK\n"
 "seviyeleri olmasalar bile atılmazlar."
 
-#: modules/core/bs_set.cpp:235
+#: modules/core/bs_set.cpp:236
 msgid ""
 "Syntax: SET channel DONTKICKVOICES {ON|OFF}\n"
 " \n"
@@ -8879,7 +8806,7 @@ msgstr ""
 "Aktifleştirildiği zaman, voice lar bot tarafından\n"
 "NOKICK seviyeleri olmasalar bile atılmazlar."
 
-#: modules/core/bs_set.cpp:241
+#: modules/core/bs_set.cpp:242
 msgid ""
 "Syntax: SET channel FANTASY {ON|OFF}\n"
 "Enables or disables fantasy mode on a channel.\n"
@@ -8913,7 +8840,7 @@ msgstr ""
 "komutunu kullanmak için, kullanıcının OPDEOP\n"
 "seviyesine yeterli access i olmalıdır)."
 
-#: modules/core/bs_set.cpp:256
+#: modules/core/bs_set.cpp:257
 msgid ""
 "Syntax: SET channel GREET {ON|OFF}\n"
 " \n"
@@ -8929,7 +8856,7 @@ msgstr ""
 "kullanıcılara bir karşılama mesajı gönderir,\n"
 "tabi eğer bu kişilerin yeterli access leri varsa."
 
-#: modules/core/bs_set.cpp:280
+#: modules/core/bs_set.cpp:281
 msgid ""
 "Syntax: SET channel MSG {OFF|PRIVMSG|NOTICE|NOTICEOPS}\n"
 " \n"
@@ -8944,7 +8871,7 @@ msgid ""
 "go directly to the user who executed it."
 msgstr ""
 
-#: modules/core/bs_set.cpp:270
+#: modules/core/bs_set.cpp:271
 msgid ""
 "Syntax: SET channel NOBOT {ON|OFF}\n"
 " \n"
@@ -8960,7 +8887,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/cs_saset_noexpire.cpp:47
+#: modules/core/cs_saset_noexpire.cpp:48
 msgid ""
 "Syntax: SET channel NOEXPIRE {ON | OFF}\n"
 " \n"
@@ -8975,7 +8902,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/bs_set.cpp:263
+#: modules/core/bs_set.cpp:264
 #, c-format
 msgid ""
 "Syntax: SET channel SYMBIOSIS {ON|OFF}\n"
@@ -8991,8 +8918,8 @@ msgstr ""
 "Aktifleştirildiği zaman bot %s'ün yaptığı herşeyi\n"
 "kendisi yapar. Modelar, kickler, ve giriş mesajı gibi."
 
-#: modules/core/ms_set.cpp:232
-#, fuzzy
+#: modules/core/ms_set.cpp:231
+#, fuzzy, c-format
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9019,7 +8946,7 @@ msgstr ""
 "Belirli bir özellik hakkında daha fazla bilgi için, \n"
 "/msg %s HELP SET özellik yazın."
 
-#: modules/core/ns_set.cpp:71
+#: modules/core/ns_set.cpp:72
 msgid ""
 "Syntax: SET option parameters\n"
 " \n"
@@ -9030,7 +8957,7 @@ msgstr ""
 "Çeşitli nick özelliklerini ayarlar.  özellik şunlardan biri \n"
 "olabilir:"
 
-#: modules/core/os_set.cpp:193
+#: modules/core/os_set.cpp:199
 #, fuzzy
 msgid ""
 "Syntax: SET option setting\n"
@@ -9056,7 +8983,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ns_set_autoop.cpp:50
+#: modules/core/ns_set_autoop.cpp:51
 msgid ""
 "Syntax: SET AUTOOP {ON | OFF}\n"
 " \n"
@@ -9068,7 +8995,7 @@ msgstr ""
 "Sets whether you will be opped automatically. Set to ON to \n"
 "allow ChanServ to op you automatically when entering channels."
 
-#: modules/core/ns_set.cpp:153
+#: modules/core/ns_set.cpp:150
 msgid ""
 "Syntax: SET DISPLAY new-display\n"
 " \n"
@@ -9081,7 +9008,7 @@ msgstr ""
 "ayarlar. Yeni görünüm grubunuzda bulunan nicklerden biri \n"
 "olmalıdır."
 
-#: modules/core/ns_set_email.cpp:65
+#: modules/core/ns_set_email.cpp:106
 msgid ""
 "Syntax: SET EMAIL address\n"
 " \n"
@@ -9095,7 +9022,7 @@ msgstr ""
 "birisi sizin hakkınızda bilgi almak için INFO komutunu \n"
 "kullandığında görünür."
 
-#: modules/core/ns_set_greet.cpp:48
+#: modules/core/ns_set_greet.cpp:49
 msgid ""
 "Syntax: SET GREET message\n"
 " \n"
@@ -9111,7 +9038,7 @@ msgstr ""
 "girdiğinizde gönderilir, kanaldaki access seviyenize\n"
 "bağlıdır."
 
-#: modules/core/ns_set_hide.cpp:84
+#: modules/core/ns_set_hide.cpp:85
 #, c-format
 msgid ""
 "Syntax: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\n"
@@ -9133,7 +9060,7 @@ msgstr ""
 "saklayabilirsiniz. İkinici parametre bilginin görünüp (OFF)\n"
 "görünmeyeceğini (ON) belirtmenizi sağlar."
 
-#: modules/core/ns_set_kill.cpp:74
+#: modules/core/ns_set_kill.cpp:75
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET KILL {ON | QUICK | IMMED | OFF}\n"
@@ -9166,7 +9093,7 @@ msgstr ""
 "bu özelliği kullanmayın. Hatta network yöneticileri bu\n"
 "özelliği devre dışı bırakmış olabilirler."
 
-#: modules/core/ns_set_language.cpp:53 modules/core/ns_set_language.cpp:96
+#: modules/core/ns_set_language.cpp:54 modules/core/ns_set_language.cpp:90
 #, fuzzy
 msgid ""
 "Syntax: SET LANGUAGE language\n"
@@ -9183,7 +9110,7 @@ msgstr ""
 "numara aşağıdaki listede desteklenen dillerden biri olarak \n"
 "belirlenir:"
 
-#: modules/core/ms_set.cpp:282
+#: modules/core/ms_set.cpp:281
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [channel] limit\n"
@@ -9199,7 +9126,7 @@ msgstr ""
 "sayısını belirler. Eğer bunu 0 yaparsanız kimse size mesaj \n"
 "gönderemeyecektir. Ayrıca bu limiti %d den fazla yapamazsınız."
 
-#: modules/core/ms_set.cpp:263
+#: modules/core/ms_set.cpp:262
 #, c-format
 msgid ""
 "Syntax: SET LIMIT [user | channel] {limit | NONE} [HARD]\n"
@@ -9239,7 +9166,7 @@ msgstr ""
 "ayrıcalıkları varsa bir kanalın mesaj limitini ve kendi mesaj\n"
 "limitlerini ayarlayabilirler."
 
-#: modules/core/os_set.cpp:202
+#: modules/core/os_set.cpp:208
 #, c-format
 msgid ""
 "Syntax: SET LIST\n"
@@ -9248,7 +9175,7 @@ msgstr ""
 "Syntax: SET LIST\n"
 "Display the various %s settings"
 
-#: modules/core/ns_set_message.cpp:56
+#: modules/core/ns_set_message.cpp:57
 msgid ""
 "Syntax: SET MSG {ON | OFF}\n"
 " \n"
@@ -9262,7 +9189,7 @@ msgstr ""
 "you. With MSG set, Services will use messages, else they'll \n"
 "use notices."
 
-#: modules/core/os_set.cpp:219
+#: modules/core/os_set.cpp:225
 #, fuzzy
 msgid ""
 "Syntax: SET NOEXPIRE {ON | OFF}\n"
@@ -9280,7 +9207,7 @@ msgstr ""
 "\n"
 "-noexpire komut satırı özelliğiyle aynıdır."
 
-#: modules/core/ms_set.cpp:243
+#: modules/core/ms_set.cpp:242
 msgid ""
 "Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\n"
 "Changes when you will be notified about new memos:\n"
@@ -9317,7 +9244,7 @@ msgstr ""
 "\n"
 "ON parametresi LOGON ve NEW 'in kombinasyonudur"
 
-#: modules/core/ns_set.cpp:215
+#: modules/core/ns_set.cpp:208
 msgid ""
 "Syntax: SET PASSWORD new-password\n"
 " \n"
@@ -9329,7 +9256,7 @@ msgstr ""
 "Nickinizi tanıtmak için kullandığınız şifreyi\n"
 "değiştirir."
 
-#: modules/core/ns_set_private.cpp:50
+#: modules/core/ns_set_private.cpp:51
 #, c-format
 msgid ""
 "Syntax: SET PRIVATE {ON | OFF}\n"
@@ -9347,7 +9274,7 @@ msgstr ""
 "gözükmeyecektir.(Buna rağmen, nickinizi bilen biri INFO \n"
 "komutunu kullanarak hakkınızda bilgi alabilir.)"
 
-#: modules/core/os_set.cpp:205
+#: modules/core/os_set.cpp:211
 msgid ""
 "Syntax: SET READONLY {ON | OFF}\n"
 " \n"
@@ -9375,7 +9302,7 @@ msgstr ""
 "\n"
 "-readonly komut satırı özelliğiyle aynıdır."
 
-#: modules/core/ns_set_secure.cpp:50
+#: modules/core/ns_set_secure.cpp:51
 #, fuzzy, c-format
 msgid ""
 "Syntax: SET SECURE {ON | OFF}\n"
@@ -9398,7 +9325,7 @@ msgstr ""
 "kullanılmış olsa bile %s sizi otomatik olarak kill\n"
 "lemeyecektir."
 
-#: modules/core/os_set.cpp:226
+#: modules/core/os_set.cpp:232
 msgid ""
 "Syntax: SET SUPERADMIN {ON | OFF}\n"
 "Setting this will grant you extra privileges such as the\n"
@@ -9412,7 +9339,7 @@ msgstr ""
 "This opion is _NOT_ persistant, and should only be used when\n"
 "needed, and set back to OFF when no longer needed."
 
-#: modules/core/hs_setall.cpp:105
+#: modules/core/hs_setall.cpp:106
 #, fuzzy
 msgid ""
 "Syntax: SETALL <nick> <hostmask>.\n"
@@ -9431,7 +9358,7 @@ msgstr ""
 "* NOTE, this will not update the vhost for any nick's\n"
 "added to the group after this command was used."
 
-#: modules/core/os_shutdown.cpp:36
+#: modules/core/os_shutdown.cpp:37
 msgid ""
 "Syntax: SHUTDOWN\n"
 " \n"
@@ -9443,7 +9370,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/os_snline.cpp:422
+#: modules/core/os_snline.cpp:391
 #, fuzzy
 msgid ""
 "Syntax: SNLINE ADD [+expiry] mask:reason\n"
@@ -9536,7 +9463,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/cs_xop.cpp:612
+#: modules/core/cs_xop.cpp:600
 #, fuzzy
 msgid ""
 "Syntax: SOP channel ADD mask\n"
@@ -9566,16 +9493,6 @@ msgid ""
 "      \n"
 "The SOP CLEAR command clears all entries of the\n"
 "SOP list.\n"
-" \n"
-"The SOP ADD, SOP DEL and SOP CLEAR commands are \n"
-"limited to the channel founder. However, any user on the\n"
-"AOP list may use the SOP LIST command.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Kullanımı: SOP kanaladi ADD nick\n"
 "           SOP kanaladi DEL {nick | kayit-no | liste}\n"
@@ -9612,7 +9529,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %s HELP SET XOP yazarak ulasabilirsiniz."
 
-#: modules/core/os_sqline.cpp:401
+#: modules/core/os_sqline.cpp:370
 #, fuzzy
 msgid ""
 "Syntax: SQLINE ADD [+expiry] mask reason\n"
@@ -9706,7 +9623,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin kullanimiyla sinirlidir."
 
-#: modules/core/os_staff.cpp:55
+#: modules/core/os_staff.cpp:56
 msgid ""
 "Syntax: STAFF\n"
 "Displays all Services Staff nicks along with level\n"
@@ -9716,7 +9633,7 @@ msgstr ""
 "Displays all Services Staff nicks along with level\n"
 "and on-line status."
 
-#: modules/core/ms_staff.cpp:46
+#: modules/core/ms_staff.cpp:47
 #, fuzzy
 msgid ""
 "Syntax: STAFF memo-text\n"
@@ -9726,7 +9643,7 @@ msgstr ""
 "Syntax: STAFF memo-text\n"
 "Sends all services staff a memo containing memo-text."
 
-#: modules/core/os_stats.cpp:262
+#: modules/core/os_stats.cpp:225
 msgid ""
 "Syntax: STATS [AKILL | ALL | RESET | MEMORY | UPLINK]\n"
 " \n"
@@ -9770,7 +9687,7 @@ msgstr ""
 "RESET parametresi önceki maksimum kullanıcı sayısını o anda\n"
 "networkte bulunan kullanıcı sayısıyla değiştirir."
 
-#: modules/core/cs_status.cpp:39
+#: modules/core/cs_status.cpp:40
 msgid ""
 "Syntax: STATUS channel nickname\n"
 " \n"
@@ -9796,7 +9713,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/ns_status.cpp:54
+#: modules/core/ns_status.cpp:55
 #, fuzzy
 msgid ""
 "Syntax: STATUS nickname...\n"
@@ -9842,7 +9759,7 @@ msgstr ""
 "yoksayılır. If no nickname is given, your status\n"
 "will be returned."
 
-#: modules/core/cs_suspend.cpp:79
+#: modules/core/cs_suspend.cpp:77
 msgid ""
 "Syntax: SUSPEND channel [reason]\n"
 " \n"
@@ -9860,7 +9777,7 @@ msgstr ""
 "\n"
 "Reason may be required on certain networks."
 
-#: modules/core/os_svsnick.cpp:70
+#: modules/core/os_svsnick.cpp:71
 msgid ""
 "Syntax: SVSNICK nick newnick\n"
 " \n"
@@ -9870,7 +9787,7 @@ msgstr ""
 "\n"
 "Forcefully changes a user's nickname from nick to newnick."
 
-#: modules/core/os_szline.cpp:404
+#: modules/core/os_szline.cpp:373
 #, fuzzy
 msgid ""
 "Syntax: SZLINE ADD [+expiry] mask reason\n"
@@ -9958,7 +9875,8 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/cs_topic.cpp:51
+#: modules/core/cs_topic.cpp:52
+#, fuzzy, c-format
 msgid ""
 "Syntax: TOPIC channel [topic]\n"
 " \n"
@@ -9981,21 +9899,7 @@ msgstr ""
 "\n"
 "Varsayilan olarak, founderin kullanma yetkisi vardir."
 
-#: modules/core/os_umode.cpp:57
-msgid ""
-"Syntax: UMODE user modes\n"
-" \n"
-"Allows Services Opers to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-msgstr ""
-"Syntax: UMODE user modes\n"
-"\n"
-"Allows Services Operators to set user modes for any user.\n"
-"Parameters are the same as for the standard /MODE\n"
-"command."
-
-#: modules/core/bs_unassign.cpp:51
+#: modules/core/bs_unassign.cpp:52
 msgid ""
 "Syntax: UNASSIGN chan\n"
 " \n"
@@ -10012,7 +9916,7 @@ msgstr ""
 "ayarları saklanır, böylece istediğinz zaman tekrar ayar \n"
 "yapmaya gerek olmadan kanala bot sokabilirsiniz."
 
-#: modules/core/cs_unban.cpp:62
+#: modules/core/cs_unban.cpp:63
 #, c-format
 msgid ""
 "Syntax: UNBAN channel [nick]\n"
@@ -10030,7 +9934,7 @@ msgstr ""
 "Varsayılan olarak, AOP lar ile 5 ve üzeri access seviyesi olanlar\n"
 "kullanabilir."
 
-#: modules/core/ns_group.cpp:235
+#: modules/core/ns_group.cpp:236
 msgid ""
 "Syntax: UNGROUP [nick]\n"
 " \n"
@@ -10047,7 +9951,7 @@ msgstr ""
 "else is reset. You may not ungroup yourself if there is only one\n"
 "nick in your group."
 
-#: modules/core/cs_suspend.cpp:143
+#: modules/core/cs_suspend.cpp:132
 msgid ""
 "Syntax: UNSUSPEND channel\n"
 " \n"
@@ -10059,7 +9963,7 @@ msgstr ""
 "Releases a suspended channel. All data and settings\n"
 "are preserved from before the suspension."
 
-#: modules/core/os_update.cpp:32
+#: modules/core/os_update.cpp:33
 msgid ""
 "Syntax: UPDATE\n"
 " \n"
@@ -10073,7 +9977,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/os_userlist.cpp:79
+#: modules/core/os_userlist.cpp:80
 msgid ""
 "Syntax: USERLIST [{pattern | channel} [INVISIBLE]]\n"
 " \n"
@@ -10098,7 +10002,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/core/cs_modes.cpp:180
+#: modules/core/cs_modes.cpp:173
 #, fuzzy
 msgid ""
 "Syntax: VOICE [#channel] [nick]\n"
@@ -10120,7 +10024,7 @@ msgstr ""
 "kullanabilir, veya VOP lar ile access seviyesi 3 ve yukarı olanlar\n"
 "kendilerine voice vermek için kullanabilirler."
 
-#: modules/core/cs_xop.cpp:677
+#: modules/core/cs_xop.cpp:662
 #, fuzzy
 msgid ""
 "Syntax: VOP channel ADD mask\n"
@@ -10149,16 +10053,6 @@ msgid ""
 "      \n"
 "The VOP CLEAR command clears all entries of the\n"
 "VOP list.\n"
-" \n"
-"The VOP ADD, VOP DEL and VOP LIST commands are \n"
-"limited to AOPs or above, while the VOP CLEAR command \n"
-"can only be used by the channel founder.\n"
-" \n"
-"This command may have been disabled for your channel, and\n"
-"in that case you need to use the access list. See \n"
-"%s%s HELP ACCESS for information about the access list,\n"
-"and %s%s HELP SET XOP to know how to toggle between \n"
-"the access list and xOP list systems."
 msgstr ""
 "Kullanımı: VOP kanaladi ADD nick\n"
 "           VOP kanaladi DEL {nick | kayit-no | liste}\n"
@@ -10192,7 +10086,7 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %s HELP SET XOP yazarak ulasabilirsiniz."
 
-#: modules/core/cs_saset.cpp:72
+#: modules/core/cs_saset.cpp:73
 msgid ""
 "Syntax: SASET channel option parameters\n"
 " \n"
@@ -10208,7 +10102,7 @@ msgstr ""
 "\n"
 "Available options:"
 
-#: modules/core/ns_suspend.cpp:91
+#: modules/core/ns_suspend.cpp:89
 msgid ""
 "Syntax: SUSPEND nickname reason\n"
 "SUSPENDs a nickname from being used."
@@ -10216,7 +10110,7 @@ msgstr ""
 "Syntax: SUSPEND nickname reason / UNSUSPEND nickname\n"
 "SUSPENDs / UNSUSPENDs a nickname from being identified to"
 
-#: modules/core/ns_suspend.cpp:159
+#: modules/core/ns_suspend.cpp:150
 msgid ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
@@ -10224,7 +10118,7 @@ msgstr ""
 "Syntax: UNSUSPEND nickname\n"
 "UNSUSPENDS a nickname from being used."
 
-#: modules/core/ns_update.cpp:44
+#: modules/core/ns_update.cpp:45
 msgid ""
 "Syntax: UPDATE\n"
 "Updates your current status, i.e. it checks for new memos,\n"
@@ -10236,51 +10130,94 @@ msgstr ""
 "sets needed chanmodes (ModeonID) and updates your vhost and\n"
 "your userflags (lastseentime, etc)."
 
-#: modules/core/cs_topic.cpp:66
+#: modules/core/cs_topic.cpp:67
 msgid "TOPIC channel [topic]"
 msgstr "TOPIC kanaladi [konu]"
 
-#: modules/core/ns_set_kill.cpp:57
+#: modules/core/cs_clearusers.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to clear (kick) all users on a channel"
+msgstr "    CLEAR      Tells ChanServ to clear certain settings on a channel"
+
+#: modules/core/cs_invite.cpp:21
+#, fuzzy
+msgid "Tells ChanServ to invite you into a channel"
+msgstr "    INVITE     Tells ChanServ to invite you into a channel"
+
+#: modules/core/os_noop.cpp:21
+#, fuzzy
+msgid "Temporarily remove all O:lines of a server remotely"
+msgstr "    NOOP        Geçici olarak tüm O:line ları kaldırır"
+
+#: modules/core/os_shutdown.cpp:21
+#, fuzzy
+msgid "Terminate services with save"
+msgstr "    SHUTDOWN    Servisler programını kayıt ederek kapatır"
+
+#: modules/core/os_quit.cpp:22
+#, fuzzy
+msgid "Terminate the Services program with no save"
+msgstr "    QUIT        Servis programını kapatır"
+
+#: modules/core/bs_badwords.cpp:295
+msgid ""
+"The BADWORDS DEL command removes the given word from the\n"
+"bad words list.  If a list of entry numbers is given, those\n"
+"entries are deleted.  (See the example for LIST below.)\n"
+" \n"
+"The BADWORDS LIST command displays the bad words list.  If\n"
+"a wildcard mask is given, only those entries matching the\n"
+"mask are displayed.  If a list of entry numbers is given,\n"
+"only those entries are shown; for example:\n"
+"   BADWORDS #channel LIST 2-5,7-9\n"
+"      Lists bad words entries numbered 2 through 5 and\n"
+"      7 through 9.\n"
+" \n"
+"The BADWORDS CLEAR command clears all entries of the\n"
+"bad words list."
+msgstr ""
+
+#: modules/core/ns_set_kill.cpp:58
 msgid "The IMMED option is not available on this network."
 msgstr "HEMEN seçeneği bu networkte aktif değil."
 
-#: modules/core/os_akill.cpp:376
+#: modules/core/os_akill.cpp:345
 msgid "The AKILL list has been cleared."
 msgstr "AKILL listesi temizlendi."
 
-#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:104
+#: modules/core/os_defcon.cpp:43 modules/core/os_defcon.cpp:112
 #, c-format
 msgid "The Defcon Level is now at Level: %d"
 msgstr "The Defcon Level is now at Level: %d"
 
-#: modules/core/ns_set_hide.cpp:39
+#: modules/core/ns_set_hide.cpp:40
 #, c-format
 msgid "The E-mail address of %s will now be hidden from %s INFO displays."
 msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:40
+#: modules/core/ns_set_hide.cpp:41
 #, c-format
 msgid "The E-mail address of %s will now be shown in %s INFO displays."
 msgstr "The E-mail address of %s will now be shown in %s INFO displays."
 
-#: modules/core/os_snline.cpp:391
+#: modules/core/os_snline.cpp:359
 msgid "The SNLINE list has been cleared."
 msgstr "SNLINE listesi temizlendi."
 
-#: modules/core/os_sqline.cpp:371
+#: modules/core/os_sqline.cpp:339
 msgid "The SQLINE list has been cleared."
 msgstr "SQLINE listesi temizlendi."
 
-#: modules/core/os_szline.cpp:373
+#: modules/core/os_szline.cpp:341
 msgid "The SZLINE list has been cleared."
 msgstr "SZLINE listesi temizlendi."
 
-#: modules/core/cs_getkey.cpp:39
+#: modules/core/cs_getkey.cpp:40
 #, c-format
 msgid "The channel %s has no key."
 msgstr "The channel %s has no key."
 
-#: modules/core/cs_access.cpp:698
+#: modules/core/cs_access.cpp:712
 #, fuzzy
 msgid ""
 "The following feature/function names are understood. Note\n"
@@ -10291,89 +10228,79 @@ msgstr ""
 "Dikkat edilirse AUTODEOP ve NOJOIN değerleri maximum, diğerleri\n"
 "minimum seviyelerdir."
 
-#: modules/core/os_session.cpp:159
+#: modules/core/os_session.cpp:164
 #, c-format
 msgid "The host %s currently has %d sessions with a limit of %d."
 msgstr "Host %s şu anda %d session a sahip ve %d ile limitli."
 
-#: modules/core/ms_check.cpp:58
+#: modules/core/ms_check.cpp:59
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has been read."
 msgstr "The last memo you sent to %s (sent on %s) has been read."
 
-#: modules/core/ms_check.cpp:56
+#: modules/core/ms_check.cpp:57
 #, c-format
 msgid "The last memo you sent to %s (sent on %s) has not yet been read."
 msgstr "The last memo you sent to %s (sent on %s) has not yet been read."
 
-#: modules/core/ns_set_hide.cpp:57
+#: modules/core/ns_set_hide.cpp:58
 #, c-format
 msgid "The last quit message of %s will now be hidden from %s INFO displays."
 msgstr "The last quit message of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:58
+#: modules/core/ns_set_hide.cpp:59
 #, c-format
 msgid "The last quit message of %s will now be shown in %s INFO displays."
 msgstr "The last quit message of %s will now be shown in %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:45
+#: modules/core/ns_set_hide.cpp:46
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:46
+#: modules/core/ns_set_hide.cpp:47
 #, c-format
 msgid ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 msgstr ""
 "The last seen user@host mask of %s will now be shown in %s INFO displays."
 
-#: modules/core/ms_set.cpp:154
+#: modules/core/ms_set.cpp:152
 #, c-format
 msgid "The memo limit for %s may not be changed."
 msgstr "%s nickinin mesaj limiti değiştirelemez."
 
-#: include/language.h:57
-#, c-format
-msgid "The new display for %s MUST be a nickname of the nickname group!"
-msgstr "The new display for %s MUST be a nickname of the nickname group!"
-
-#: include/language.h:55
-#, c-format
-msgid "The new display is now %s."
-msgstr "Yeni gösterim %s."
-
-#: modules/core/os_svsnick.cpp:61
+#: modules/core/os_svsnick.cpp:62
 #, c-format
 msgid "The nick %s is now being changed to %s."
 msgstr "The nick %s is now being changed to %s."
 
-#: modules/core/ns_group.cpp:200
+#: modules/core/ns_group.cpp:201
 #, c-format
 msgid "The nick %s is not in your group."
 msgstr "The nick %s is not in your group."
 
-#: modules/core/ns_set_hide.cpp:51
+#: modules/core/ns_set_hide.cpp:52
 #, c-format
 msgid ""
 "The services access status of %s will now be hidden from %s INFO displays."
 msgstr ""
 "The services access status of %s will now be hidden from %s INFO displays."
 
-#: modules/core/ns_set_hide.cpp:52
+#: modules/core/ns_set_hide.cpp:53
 #, c-format
 msgid "The services access status of %s will now be shown in %s INFO displays."
 msgstr ""
 "The services access status of %s will now be shown in %s INFO displays."
 
-#: src/channels.cpp:138
+#: src/channels.cpp:136
 #, c-format
 msgid "There are %d memos on channel %s."
 msgstr "There are %d memos on channel %s."
 
-#: modules/core/bs_botlist.cpp:58
+#: modules/core/bs_botlist.cpp:59
 msgid ""
 "There are no bots available at this time.\n"
 "Ask a Services Operator to create one!"
@@ -10381,7 +10308,8 @@ msgstr ""
 "Şu an mevcut bot yok.\n"
 "Server adminine bir tane yaratmasını söyleyin!"
 
-#: modules/core/ns_group.cpp:81
+#: modules/core/ns_group.cpp:80
+#, fuzzy, c-format
 msgid ""
 "There are too many nicks in %s's group; list them and drop some.\n"
 "Type %s%s HELP GLIST and %s%s HELP DROP\n"
@@ -10391,20 +10319,12 @@ msgstr ""
 "Daha fazla bilgi için /msg %s HELP GLIST ve /msg %s HELP DROP \n"
 "yazin."
 
-#: src/channels.cpp:136
+#: src/channels.cpp:134
 #, c-format
 msgid "There is %d memo on channel %s."
 msgstr "There is %d memo on channel %s."
 
-#: include/language.h:93
-msgid ""
-"There is a new memo on channel %s.\n"
-"Type %s%s READ %s %d to read it."
-msgstr ""
-"There is a new memo on channel %s.\n"
-"Type /msg %s READ %s %d to read it."
-
-#: modules/core/bs_unassign.cpp:44
+#: modules/core/bs_unassign.cpp:45
 #, c-format
 msgid "There is no bot assigned to %s anymore."
 msgstr "%s kanalından bot çıkarıldı."
@@ -10425,7 +10345,7 @@ msgstr "Hiç karisik haber yok."
 msgid "There's no email address set for your nick."
 msgstr "There's no email address set for your nick."
 
-#: modules/core/bs_set.cpp:221
+#: modules/core/bs_set.cpp:222
 msgid ""
 "These options are reserved to Services Operators:\n"
 " \n"
@@ -10441,82 +10361,38 @@ msgstr ""
 "                        sokulmasini engeller\n"
 "                        "
 
-#: modules/core/cs_forbid.cpp:77
-msgid "This channel has been forbidden."
-msgstr "This channel has been forbidden."
-
-#: src/chanserv.cpp:304 src/chanserv.cpp:334
+#: src/chanserv.cpp:307 src/chanserv.cpp:337
 #, c-format
 msgid "This channel has been registered with %s."
 msgstr "Bu kanal %s ile kayıtlıdır."
 
-#: modules/core/cs_suspend.cpp:62
-msgid "This channel has been suspended."
-msgstr "This channel has been suspended."
-
-#: src/regchannel.cpp:747
+#: src/regchannel.cpp:741
 msgid "This channel may not be used."
 msgstr "Bu kanal kullanılamaz."
 
-#: modules/core/cs_info.cpp:104
-msgid "This channel will not expire."
-msgstr "Bu kanal için zaman aşımı söz konusu değil."
-
-#: include/language.h:66
-msgid ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-msgstr ""
-"This nick has already been requested, please check your e-mail address for "
-"the pass code"
-
-#: include/language.h:67
-msgid ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-msgstr ""
-"This nick is awaiting an e-mail verification code before completing "
-"registration."
-
-#: include/language.h:44
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"Bu nick başkasına ait. Lütfen başka bir tane seçin.\n"
-"(Eğer bu sizin nickiniz ise, /msg %s IDENTIFY şifreniz yazınız.)"
-
-#: include/language.h:49
-msgid "This nickname has been registered; you may not use it."
-msgstr "Bu nick kayıtlıdır; bunu kullanamazsınız."
-
-#: modules/core/ns_info.cpp:135
+#: modules/core/ns_info.cpp:129
 msgid "This nickname is currently suspended"
 msgstr "This nickname is currently suspended"
 
-#: modules/core/ns_info.cpp:133
+#: modules/core/ns_info.cpp:127
 #, c-format
 msgid "This nickname is currently suspended, reason: %s"
 msgstr "This nickname is currently suspended, reason: %s"
 
-#: include/language.h:46
-msgid ""
-"This nickname is registered and protected.  If it is your\n"
-"nick, type %s%s IDENTIFY password.  Otherwise,\n"
-"please choose a different nick."
-msgstr ""
-"Bu nick kayıtlı ve korumalıdır. Eğer bu sizin nickiniz ise, \n"
-"/msg %s IDENTIFY şifreniz yazınız. Yada, başka bir nick seçin."
+#: modules/core/ns_info.cpp:146
+#, fuzzy
+msgid "This nickname is unconfirmed."
+msgstr "Bu nick zaman aşımına uğramayacak."
 
-#: src/nickserv.cpp:185
+#: src/nickserv.cpp:177
 msgid "This nickname may not be used.  Please choose another one."
 msgstr "Bu nick kullanılamaz.  Lütfen başka bir tane seçin."
 
-#: modules/core/ns_info.cpp:139
+#: modules/core/ns_info.cpp:135
 msgid "This nickname will not expire."
 msgstr "Bu nick zaman aşımına uğramayacak."
 
-#: modules/core/cs_list.cpp:48 modules/core/cs_list.cpp:57
+#: modules/core/cs_list.cpp:56
 msgid ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
@@ -10524,30 +10400,60 @@ msgstr ""
 "To search for channels starting with #, search for the channel\n"
 "name without the #-sign prepended (anope instead of #anope)."
 
-#: modules/core/cs_info.cpp:95
+#: modules/core/cs_set_xop.cpp:22
+#, fuzzy
+msgid "Toggle the user privilege system"
+msgstr "    XOP           Ayricalik sistemleri arasinda geçisi saglar"
+
+#: modules/core/cs_info.cpp:96
 msgid "Topic Lock"
 msgstr "Topic kilidi"
 
-#: modules/core/cs_info.cpp:83
+#: modules/core/cs_info.cpp:84
 msgid "Topic Retention"
 msgstr "Topic hatırlama"
 
-#: modules/core/cs_set_topiclock.cpp:32 modules/core/cs_set_topiclock.cpp:37
+#: modules/core/cs_set_topiclock.cpp:21
+#, fuzzy
+msgid "Topic can only be changed with TOPIC"
+msgstr "    TOPICLOCK     Topic sadece SET TOPIC komutuyla değiştirilir"
+
+#: modules/core/cs_set_topiclock.cpp:38
 #, fuzzy, c-format
-msgid "Topic lock option for %s is now ."
+msgid "Topic lock option for %s is now off."
 msgstr "Topic lock option for %s is now ON."
 
-#: modules/core/cs_set_keeptopic.cpp:32 modules/core/cs_set_keeptopic.cpp:37
+#: modules/core/cs_set_topiclock.cpp:33
 #, fuzzy, c-format
-msgid "Topic retention option for %s is now ."
+msgid "Topic lock option for %s is now on."
+msgstr "Topic lock option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:38
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now off."
+msgstr "Topic retention option for %s is now ON."
+
+#: modules/core/cs_set_keeptopic.cpp:33
+#, fuzzy, c-format
+msgid "Topic retention option for %s is now on."
 msgstr "Topic retention option for %s is now ON."
 
 #: src/botserv.cpp:185
 msgid "Turn caps lock OFF!"
 msgstr "Lütfen büyük harf kullanmayın!"
 
-#: modules/core/ms_help.cpp:42
+#: modules/core/ns_set_secure.cpp:21
+#, fuzzy
+msgid "Turn nickname security on or off"
+msgstr "    SECURE     Nick güvenliğini açar kapatır"
+
+#: modules/core/ns_set_kill.cpp:21
 #, fuzzy
+msgid "Turn protection on or off"
+msgstr "    KILL       Korumayı açar kapatır"
+
+#: modules/core/ms_help.cpp:43
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP command for help on any of the\n"
 "above commands.\n"
@@ -10562,7 +10468,8 @@ msgstr ""
 "    seviyesi en az 10 olanlar okuyabilir. Bu %s LEVELS \n"
 "    komutuyla değiştirebilir."
 
-#: modules/core/ns_saset.cpp:82
+#: modules/core/ns_saset.cpp:83
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information\n"
 "on a specific option. The options will be set on the given\n"
@@ -10572,7 +10479,8 @@ msgstr ""
 "on a specific option. The options will be set on the given\n"
 "nickname."
 
-#: modules/core/cs_saset.cpp:80
+#: modules/core/cs_saset.cpp:81
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SASET option for more information on a\n"
 "particular option."
@@ -10580,7 +10488,8 @@ msgstr ""
 "Type /msg %s HELP SASET option for more information on a\n"
 "particular option."
 
-#: modules/core/cs_set.cpp:84
+#: modules/core/cs_set.cpp:85
+#, fuzzy, c-format
 msgid ""
 "Type %s%s HELP SET option for more information on a\n"
 "particular option."
@@ -10588,130 +10497,130 @@ msgstr ""
 "Belirli bir özellik hakkında daha fazla bilgi için\n"
 "/msg %s HELP özellik yazın."
 
-#: modules/core/ns_identify.cpp:93
-msgid ""
-"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
-"Your privacy is respected; this e-mail won't be given to\n"
-"any third-party person."
-msgstr ""
-"Mail adresinizi ayarlamak için /msg %s SET EMAIL e-mailadresiniz \n"
-"yazın. Gizliliğiniz korunacaktır; bu mail adresi herhangi üçüncü \n"
-"şahıslara verilmeyecektir."
-
 #: src/memoserv.cpp:73
+#, fuzzy, c-format
 msgid "Type %s%s LIST NEW to list them."
 msgstr "Listelemek için /msg %s LIST NEW yazın."
 
 #: src/memoserv.cpp:70
+#, fuzzy, c-format
 msgid "Type %s%s READ %d to read it."
 msgstr "Okumak için /msg %s READ %d yazın."
 
 #: src/memoserv.cpp:62
+#, fuzzy, c-format
 msgid "Type %s%s READ LAST to read it."
 msgstr "Okumak için /msg %s READ LAST yazın."
 
-#: modules/core/os_umode.cpp:67
-msgid "UMODE nick modes"
-msgstr "UMODE nick modes"
+#: src/users.cpp:371
+#, fuzzy, c-format
+msgid ""
+"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
+"Your privacy is respected; this e-mail won't be given to\n"
+"any third-party person."
+msgstr ""
+"Mail adresinizi ayarlamak için /msg %s SET EMAIL e-mailadresiniz \n"
+"yazın. Gizliliğiniz korunacaktır; bu mail adresi herhangi üçüncü \n"
+"şahıslara verilmeyecektir."
 
-#: modules/core/bs_unassign.cpp:63
+#: modules/core/bs_unassign.cpp:64
 msgid "UNASSIGN chan"
 msgstr "UNASSIGN kanaladı"
 
-#: modules/core/cs_unban.cpp:74
+#: modules/core/cs_unban.cpp:75
 msgid "UNBAN channel [nick]"
 msgstr "UNBAN kanaladı [name]"
 
-#: modules/core/cs_suspend.cpp:152
+#: modules/core/cs_suspend.cpp:141
 msgid "UNSUSPEND channel"
 msgstr "UNSUSPEND channel"
 
-#: modules/core/ns_suspend.cpp:166
+#: modules/core/ns_suspend.cpp:157
 msgid "UNSUSPEND nickname"
 msgstr "UNSUSPEND nickname"
 
-#: modules/core/os_modload.cpp:49 modules/core/os_modreload.cpp:75
+#: modules/core/os_modunload.cpp:21
+#, fuzzy
+msgid "Un-Load a module"
+msgstr "    MODUNLOAD   Un-Load a module"
+
+#: modules/core/os_modload.cpp:50 modules/core/os_modreload.cpp:76
 #, c-format
 msgid "Unable to load module %s"
 msgstr "Unable to load module %s"
 
-#: modules/core/os_modunload.cpp:37 modules/core/os_modunload.cpp:43
-#: modules/core/os_modunload.cpp:57 modules/core/os_modreload.cpp:37
-#: modules/core/os_modreload.cpp:43 modules/core/os_modreload.cpp:53
+#: modules/core/os_modunload.cpp:38 modules/core/os_modunload.cpp:44
+#: modules/core/os_modunload.cpp:58 modules/core/os_modreload.cpp:38
+#: modules/core/os_modreload.cpp:44 modules/core/os_modreload.cpp:54
 #, c-format
 msgid "Unable to remove module %s"
 msgstr "Unable to remove module %s"
 
-#: modules/core/ns_saset.cpp:67 modules/core/cs_saset.cpp:61
+#: modules/core/bs_unassign.cpp:21
+#, fuzzy
+msgid "Unassigns a bot from a channel"
+msgstr "UNASSIGN           Unassigns a bot from a channel"
+
+#: modules/core/ns_saset.cpp:68 modules/core/cs_saset.cpp:62
 #, c-format
 msgid "Unknown SASET option %s."
 msgstr "Unknown SASET option %s."
 
-#: include/language.h:54
-#, c-format
-msgid "Unknown SET option %s."
-msgstr "Varolmayan SET özelliği: %s."
-
-#: modules/core/os_stats.cpp:245
+#: modules/core/os_stats.cpp:208
 #, c-format
 msgid "Unknown STATS option %s."
 msgstr "Varolmayan STATS özelliği: %s."
 
 #: src/commands.cpp:60
-msgid "Unknown command %s.  \"%s%s HELP\" for help."
+#, fuzzy, c-format
+msgid "Unknown command %s. \"%s%s HELP\" for help."
 msgstr "Varolmayan komut %s. yardım için \"/msg %s HELP\" yazınız."
 
-#: modules/core/cs_mode.cpp:49 modules/core/cs_mode.cpp:92
+#: modules/core/cs_mode.cpp:70 modules/core/cs_mode.cpp:113
 #, fuzzy, c-format
 msgid "Unknown mode character %c ignored."
 msgstr "Varolmayan mod karakteri %c yoksayıldı."
 
-#: modules/core/os_set.cpp:185
+#: modules/core/os_set.cpp:191
 #, c-format
 msgid "Unknown option %s."
 msgstr "Varolmayan özellik %s."
 
-#: include/language.h:41
+#: modules/core/ns_suspend.cpp:105
 #, fuzzy
-msgid ""
-"Unknown option %s.\n"
-"Type %s%s HELP %s for more information."
+msgid "Unsuspend a given nick"
+msgstr "    UNSUSPEND  Unsuspend a given nick"
+
+#: modules/core/ns_update.cpp:21
+#, fuzzy
+msgid "Updates your current status, i.e. it checks for new memos"
 msgstr ""
-"Varolmayan özellik %s.\n"
-"Daha fazla bilgi için /msg %s HELP SET yazın."
+"    UPDATE     Updates your current status, i.e. it checks for new memos"
 
-#: modules/core/os_update.cpp:25
+#: modules/core/os_update.cpp:26
 msgid "Updating databases."
 msgstr "Veritabanı güncelleniyor."
 
-#: modules/core/os_stats.cpp:190
+#: modules/core/os_stats.cpp:152
 #, c-format
 msgid "Uplink capab: %s"
 msgstr "Uplink capab: %s"
 
-#: modules/core/os_stats.cpp:189
+#: modules/core/os_stats.cpp:151
 #, c-format
 msgid "Uplink server: %s"
 msgstr "Uplink server: %s"
 
-#: modules/core/os_stats.cpp:203
+#: modules/core/os_stats.cpp:165
 #, c-format
 msgid "User          : %6d records, %5d kB"
 msgstr "Kullanıcı  : %6d kayıt, %5d kB"
 
-#: include/language.h:64
-msgid ""
-"User claiming your nick has been killed.\n"
-"%s%s RELEASE %s to get it back before %s timeout."
-msgstr ""
-"User claiming your nick has been killed.\n"
-"/msg %s RELEASE %s to get it back before %s timeout."
-
-#: src/botserv.cpp:533
+#: src/botserv.cpp:542
 msgid "User matches channel except."
 msgstr "User matches channel except."
 
-#: modules/core/os_userlist.cpp:52
+#: modules/core/os_userlist.cpp:53
 msgid ""
 "Users list:\n"
 "Nick                 Mask"
@@ -10719,16 +10628,35 @@ msgstr ""
 "Kullanıcı listesi:\n"
 "Nick                 Mask"
 
-#: modules/core/cs_modes.cpp:194
+#: modules/core/cs_modes.cpp:187
 #, fuzzy
 msgid "VOICE [#channel] [nick]"
 msgstr "VOICE #channel [nick]"
 
-#: modules/core/cs_xop.cpp:718
+#: modules/core/cs_xop.cpp:704
 msgid "VOP channel {ADD|DEL|LIST|CLEAR} [nick | entry-list]"
 msgstr "VOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/core/bs_info.cpp:191
+#: modules/core/os_config.cpp:151
+#, fuzzy, c-format
+msgid "Value of %s:%s changed to %s"
+msgstr "%s kanalının founderı %s olarak değiştirildi."
+
+#: modules/core/os_config.cpp:37
+msgid "View and change configuration file settings"
+msgstr ""
+
+#: modules/core/os_session.cpp:172
+#, fuzzy
+msgid "View the list of host sessions"
+msgstr "    SESSION     Host session(oturum) ların listesini gösterir"
+
+#: modules/core/cs_modes.cpp:161
+#, fuzzy
+msgid "Voices a selected nick on a channel"
+msgstr "    VOICE      Voices a selected nick on a channel"
+
+#: modules/core/bs_info.cpp:192
 msgid "Voices protection"
 msgstr "Voiceları koruma"
 
@@ -10754,16 +10682,16 @@ msgstr ""
 msgid "Watch your language!"
 msgstr "Konuşmalarına dikkat et!"
 
-#: modules/core/ns_group.cpp:75
+#: modules/core/ns_group.cpp:74
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "%s grubunun zaten bir üyesisiniz."
 
-#: modules/core/ns_identify.cpp:49
+#: modules/core/ns_identify.cpp:44 modules/core/os_login.cpp:35
 msgid "You are already identified."
 msgstr "You are already identified."
 
-#: modules/core/cs_invite.cpp:61
+#: modules/core/cs_invite.cpp:62
 #, c-format
 msgid "You are already in %s! "
 msgstr "You are already in %s! "
@@ -10772,11 +10700,7 @@ msgstr "You are already in %s! "
 msgid "You are no longer a SuperAdmin"
 msgstr "You are no longer a SuperAdmin"
 
-#: include/language.h:69
-msgid "You are not permitted to be on this channel."
-msgstr "Bu kanalda bulunmanıza müsaade yok."
-
-#: modules/core/ms_set.cpp:159
+#: modules/core/ms_set.cpp:157
 msgid "You are not permitted to change your memo limit."
 msgstr "Mesaj limitinizi belirlemeye izinli değilsiniz."
 
@@ -10784,11 +10708,12 @@ msgstr "Mesaj limitinizi belirlemeye izinli değilsiniz."
 msgid "You are now a SuperAdmin"
 msgstr "You are now a SuperAdmin"
 
-#: modules/core/os_oline.cpp:37
+#: modules/core/os_oline.cpp:38
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: modules/core/ns_resetpass.cpp:122
+#: modules/core/ns_resetpass.cpp:110
+#, fuzzy, c-format
 msgid ""
 "You are now identified for your nick. Change your password using \"%s%s SET "
 "PASSWORD newpassword\" now."
@@ -10796,41 +10721,42 @@ msgstr ""
 "You are now identified for your nick. Change your password using \"/msg %s "
 "SET PASSWORD newpassword\" now."
 
-#: modules/core/ns_group.cpp:126
+#: modules/core/ns_group.cpp:119
 #, c-format
 msgid "You are now in the group of %s."
 msgstr "%s grubuna dahil edildiniz."
 
-#: modules/core/os_jupe.cpp:33
+#: modules/core/os_jupe.cpp:34
 msgid "You can not jupe your services server or your uplink server."
 msgstr "You can not jupe your services server or your uplink server."
 
-#: modules/core/ms_rsend.cpp:34
+#: modules/core/ms_rsend.cpp:35
 msgid "You can not request a receipt when sending a memo to yourself."
 msgstr "You can not request a receipt when sending a memo to yourself."
 
-#: modules/core/bs_unassign.cpp:37
+#: modules/core/bs_unassign.cpp:38
 msgid "You can not unassign bots while persist is set on the channel."
 msgstr "You can not unassign bots while persist is set on the channel."
 
-#: src/commands.cpp:217
+#: src/commands.cpp:222
 msgid "You can use this command."
 msgstr "You can use this command."
 
-#: modules/core/ns_ghost.cpp:42
+#: modules/core/ns_ghost.cpp:43
 msgid "You can't ghost yourself!"
 msgstr "Kendinizi ghost edemezsiniz!"
 
-#: modules/core/ns_logout.cpp:36
+#: modules/core/ns_logout.cpp:37
 #, fuzzy, c-format
 msgid "You can't logout %s because they are a Services Operator."
 msgstr "Can't logout %s because he's a Services Operator."
 
-#: modules/core/ns_recover.cpp:42
+#: modules/core/ns_recover.cpp:43
 msgid "You can't recover yourself!"
 msgstr "Kendizi recover edemezsiniz!"
 
-#: modules/core/cs_access.cpp:432
+#: modules/core/cs_access.cpp:439
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP and VOP commands instead.\n"
@@ -10840,7 +10766,8 @@ msgstr ""
 "Yerine AOP, SOP veya VOP komutlarini kullanin.\n"
 "Daha fazla bilgi için /msg %s HELP komut yazin."
 
-#: modules/core/cs_access.cpp:428
+#: modules/core/cs_access.cpp:435
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. \n"
 "Use the AOP, SOP, HOP and VOP commands instead.\n"
@@ -10851,6 +10778,7 @@ msgstr ""
 "Type /msg %s HELP command for more information."
 
 #: modules/core/cs_xop.cpp:370
+#, fuzzy, c-format
 msgid ""
 "You can't use this command. Use the ACCESS command instead.\n"
 "Type %s%s HELP ACCESS for more information."
@@ -10858,56 +10786,66 @@ msgstr ""
 "Bu komutu kullanamazsiniz. Yerine ACCESS komutunu kullanin.\n"
 "Daha fazla bilgi için /msg %s HELP ACCESS yazin."
 
-#: modules/core/ms_set.cpp:168
+#: modules/core/ms_set.cpp:171
 #, c-format
 msgid "You cannot set the memo limit for %s higher than %d."
 msgstr "%s nickinin mesaj limitini %d sayısından daha fazla yapamazsınız."
 
-#: modules/core/ms_set.cpp:170
+#: modules/core/ms_set.cpp:173
 #, c-format
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Mesaj limitinizi %d sayısından daha fazla yapamazsınız."
 
-#: modules/core/ns_set_email.cpp:35
+#: modules/core/ns_set_email.cpp:64
 msgid "You cannot unset the e-mail on this network."
 msgstr "E-mail adresini bu networkte silemezsiniz."
 
-#: src/commands.cpp:214
+#: src/commands.cpp:219
 msgid "You cannot use this command."
 msgstr "You cannot use this command."
 
-#: modules/core/ms_info.cpp:156
+#: modules/core/ms_info.cpp:157
 #, c-format
 msgid "You currently have %d memos, of which %d are unread."
 msgstr "Şu an %d mesajınız var, %d tanesi okunmamış."
 
-#: modules/core/ms_info.cpp:154
+#: modules/core/ms_info.cpp:155
 #, c-format
 msgid "You currently have %d memos, of which 1 is unread."
 msgstr "Şu an %d mesajınız var, 1 tanesi okunmamış."
 
-#: modules/core/ms_info.cpp:152
+#: modules/core/ms_info.cpp:153
 #, c-format
 msgid "You currently have %d memos."
 msgstr "Şu an %d mesajınız var."
 
-#: modules/core/ms_info.cpp:150
+#: modules/core/ms_info.cpp:151
 #, c-format
 msgid "You currently have %d memos; all of them are unread."
 msgstr "Şu an %d mesajınız var; hiçbiri okunmamış."
 
-#: modules/core/ms_info.cpp:139
+#: modules/core/ms_info.cpp:140
 msgid "You currently have 1 memo, and it has not yet been read."
 msgstr "Şu an 1 mesajınız var, ve henüz okunmadı."
 
-#: modules/core/ms_info.cpp:141
+#: modules/core/ms_info.cpp:142
 msgid "You currently have 1 memo."
 msgstr "Şu an 1 mesajınız var."
 
-#: modules/core/ms_info.cpp:135
+#: modules/core/ms_info.cpp:136
 msgid "You currently have no memos."
 msgstr "Şu an hiç mesajınız yok."
 
+#: modules/core/cs_mode.cpp:229
+#, c-format
+msgid "You do not have access to set mode %c."
+msgstr ""
+
+#: modules/core/cs_mode.cpp:247 modules/core/cs_mode.cpp:269
+#, c-format
+msgid "You do not have the access to change %s's modes."
+msgstr ""
+
 #: src/memoserv.cpp:60
 #, c-format
 msgid "You have %d new memos."
@@ -10917,64 +10855,47 @@ msgstr "%d yeni mesajınız var."
 msgid "You have 1 new memo."
 msgstr "1 yeni mesajınız var."
 
-#: include/language.h:95
-msgid ""
-"You have a new memo from %s.\n"
-"Type %s%s READ %d to read it."
-msgstr ""
-"%s nickinden yeni mesajınız var.\n"
-"Okumak için /msg %s READ %d yazın."
-
-#: modules/core/cs_invite.cpp:66
+#: modules/core/cs_invite.cpp:67
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
 
-#: modules/core/cs_unban.cpp:53
+#: modules/core/cs_unban.cpp:54
 #, c-format
 msgid "You have been unbanned from %s."
 msgstr "%s kanalındaki banınız kaldırıldı."
 
-#: modules/core/ms_info.cpp:174
+#: modules/core/ms_info.cpp:175
 msgid "You have no limit on the number of memos you may keep."
 msgstr "Saklayabileceğiniz mesaj sayısında limit yok."
 
-#: include/language.h:97
-msgid "You have no memos."
-msgstr "Hiç mesajınız yok."
-
-#: include/language.h:101
-msgid "You have no new memos."
-msgstr "Hiç yeni mesajınız yok."
-
 #: modules/core/os_ignore.cpp:168
 msgid "You have to enter a valid number as time."
 msgstr "You have to enter a valid number as time."
 
-#: modules/core/ns_ghost.cpp:47
+#: modules/core/ns_ghost.cpp:49
 msgid "You may not ghost an unidentified user, use RECOVER instead."
 msgstr ""
 
-#: include/language.h:104
-msgid ""
-"You must assign a bot to the channel before using this command.\n"
-"Type %s%s HELP ASSIGN for more information."
+#: modules/core/cs_register.cpp:47
+msgid "You must be a channel operator to register the channel."
 msgstr ""
-"Bu komutu kullanmadan önce kanala bir bot sokmalısınız.\n"
-"Daha fazla bilgi için /msg %s HELP ASSIGN yazın."
+"Kanal kayıt edebilmeniz için kayıt edilmemiş bir kanala ilk girip op olmanız "
+"gerekmektedir."
 
-#: modules/core/cs_register.cpp:48
-msgid "You must be a channel operator to register the channel."
+#: modules/core/cs_register.cpp:37
+#, fuzzy
+msgid "You must confirm your account before you can register a channel."
 msgstr ""
 "Kanal kayıt edebilmeniz için kayıt edilmemiş bir kanala ilk girip op olmanız "
 "gerekmektedir."
 
-#: modules/core/ns_register.cpp:212
+#: modules/core/ns_register.cpp:115
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "You have to be connected longer than %d seconds to register your nick."
 
-#: modules/core/ns_identify.cpp:90
+#: src/users.cpp:368
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -10984,24 +10905,24 @@ msgstr ""
 "Bu e-mail adresi şifrenizi unutmanız halinde şifrenizi\n"
 "isterken kullanılacaktır."
 
-#: src/commands.cpp:211
+#: src/commands.cpp:216
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/core/ms_info.cpp:178
+#: modules/core/ms_info.cpp:179
 msgid "You will be notified of new memos at logon and when they arrive."
 msgstr ""
 "Yeni mesajlar için bağlandığınızda ve size ulaştığında uyarılacaksınız."
 
-#: modules/core/ms_info.cpp:182
+#: modules/core/ms_info.cpp:183
 msgid "You will be notified of new memos at logon."
 msgstr "Yeni mesajlar için bağlandığınızda uyarılacaksınız."
 
-#: modules/core/ms_info.cpp:180
+#: modules/core/ms_info.cpp:181
 msgid "You will be notified when new memos arrive."
 msgstr "Yeni mesajlar için ulaştıkları anda uyarılacaksınız."
 
-#: modules/core/ms_set.cpp:190
+#: modules/core/ms_set.cpp:188
 msgid "You will no longer be able to receive memos."
 msgstr "Limitiniz sıfır olduğundan artık mesaj alamayacaksınız."
 
@@ -11009,7 +10930,7 @@ msgstr "Limitiniz sıfır olduğundan artık mesaj alamayacaksınız."
 msgid "You will no longer be informed via email."
 msgstr "You will no longer be informed via email."
 
-#: modules/core/ms_info.cpp:184
+#: modules/core/ms_info.cpp:185
 msgid "You will not be notified of new memos."
 msgstr "Yeni mesajlar için uyarılmayacaksınız."
 
@@ -11017,18 +10938,20 @@ msgstr "Yeni mesajlar için uyarılmayacaksınız."
 msgid "You will now be informed about new memos via email."
 msgstr "You will now be informed about new memos via email."
 
-#: include/language.h:118
-msgid ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-msgstr ""
-"Your IRCD does not support vIdent's, if this is incorrect, please report "
-"this as a possible bug"
-
 #: modules/core/ns_access.cpp:102
 msgid "Your access list is empty."
 msgstr "Your access list is empty."
 
+#: modules/core/ns_register.cpp:280
+#, fuzzy
+msgid "Your account is already confirmed."
+msgstr "You are already identified."
+
+#: src/users.cpp:381
+#, c-format
+msgid "Your account will expire, if not confirmed, in %s"
+msgstr ""
+
 #: modules/core/ns_ajoin.cpp:24
 #, fuzzy
 msgid "Your auto join list is empty."
@@ -11044,35 +10967,56 @@ msgid ""
 "  Num   Channel      Key"
 msgstr ""
 
-#: modules/core/ms_ignore.cpp:74
+#: modules/core/ns_cert.cpp:110
+#, fuzzy
+msgid "Your certificate list is empty."
+msgstr "Your access list is empty."
+
+#: modules/core/ns_set_email.cpp:176
+#, fuzzy, c-format
+msgid "Your email address has been changed to %s."
+msgstr "E-mail address for %s changed to %s."
+
+#: src/users.cpp:378
+msgid ""
+"Your email address is not confirmed. To confirm it, follow the instructions "
+"that were emailed to you when you registered."
+msgstr ""
+
+#: modules/core/ns_register.cpp:52
+#, fuzzy, c-format
+msgid "Your email address of %s has been confirmed."
+msgstr "%s serverındaki tüm O:line lar silindi."
+
+#: modules/core/ms_ignore.cpp:75
 #, fuzzy
 msgid "Your memo ignore list is empty."
 msgstr "Ignore listesi boş."
 
-#: modules/core/ms_set.cpp:197
+#: modules/core/ms_set.cpp:195
 msgid "Your memo limit has been disabled."
 msgstr "Mesaj limitiniz kapatıldı."
 
-#: modules/core/ms_set.cpp:183
+#: modules/core/ms_set.cpp:181
 #, c-format
 msgid "Your memo limit has been set to %d."
 msgstr "Mesaj limitiniz %d olarak ayarlandı."
 
-#: modules/core/ms_info.cpp:169
+#: modules/core/ms_info.cpp:170
 #, c-format
 msgid "Your memo limit is %d, and may not be changed."
 msgstr "Mesaj limitiniz %d, ve değiştirilemez."
 
-#: modules/core/ms_info.cpp:171
+#: modules/core/ms_info.cpp:172
 #, c-format
 msgid "Your memo limit is %d."
 msgstr "Mesaj limitiniz %d."
 
-#: modules/core/ms_info.cpp:164
+#: modules/core/ms_info.cpp:165
 msgid "Your memo limit is 0; you will not receive any new memos."
 msgstr "Mesaj limitiniz 0; hiç mesaj alamayacaksınız."
 
-#: modules/core/ms_info.cpp:162
+#: modules/core/ms_info.cpp:163
 msgid ""
 "Your memo limit is 0; you will not receive any new memos.  You cannot change "
 "this limit."
@@ -11080,63 +11024,59 @@ msgstr ""
 "Mesaj limitiniz 0; hiç yeni mesaj alamayacaksınız.  Bu limiti "
 "değiştiremezsiniz."
 
-#: modules/core/ns_logout.cpp:49
+#: modules/core/ns_logout.cpp:50
 msgid "Your nick has been logged out."
 msgstr "Nickinizin çıkışı yapıldı."
 
-#: modules/core/ns_group.cpp:79
-#, fuzzy
+#: modules/core/ns_group.cpp:78
+#, fuzzy, c-format
 msgid "Your nick is already registered; type %s%s DROP first."
 msgstr "Nickiniz zaten kayıtlı; önce /msg %s DROP yazın."
 
-#: modules/core/ns_group.cpp:196
+#: modules/core/ns_group.cpp:197
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Your nick is not grouped to anything, you can't ungroup it."
 
-#: include/language.h:20
-msgid "Your nick isn't registered."
-msgstr "Nickiniz kayıtlı değil."
-
-#: modules/core/ns_drop.cpp:110
+#: modules/core/ns_drop.cpp:83
 msgid "Your nickname has been dropped."
 msgstr "Nickinizin kaydı silindi (dropped)."
 
-#: src/users.cpp:320
+#: src/users.cpp:325
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Nickiniz %s olarak değiştirildi."
 
-#: modules/core/ns_register.cpp:385
+#: modules/core/os_login.cpp:33
+msgid "Your oper block doesn't require logging in."
+msgstr ""
+
+#: modules/core/ns_register.cpp:288
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: modules/core/ns_register.cpp:64
+#: modules/core/ns_register.cpp:195
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
 "Nick Şifreniz %s - İlerde kullanacağınız için unutmayınız ve kimseye "
 "söylemeyiniz."
 
-#: include/language.h:19
-msgid "Your password is too long. Please try again with a shorter password."
-msgstr "Your password is too long. Please try again with a shorter password."
-
-#: modules/core/ns_resetpass.cpp:102
+#: modules/core/ns_resetpass.cpp:98
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
-#: src/hostserv.cpp:174 modules/core/hs_on.cpp:32
+#: src/hostserv.cpp:174 modules/core/hs_on.cpp:33
 #, c-format
 msgid "Your vhost of %s is now activated."
 msgstr "Your vhost of %s is now activated."
 
-#: src/hostserv.cpp:172 modules/core/hs_on.cpp:30
+#: src/hostserv.cpp:172 modules/core/hs_on.cpp:31
 #, c-format
 msgid "Your vhost of %s@%s is now activated."
 msgstr "Your vhost of %s@%s is now activated."
 
-#: modules/core/hs_off.cpp:34
+#: modules/core/hs_off.cpp:35
 msgid "Your vhost was removed and the normal cloaking restored."
 msgstr "Your vhost was removed and the normal cloaking restored."
 
@@ -11155,94 +11095,95 @@ msgstr "[Operatör Haberleri - %s] %s"
 msgid "[Random News - %s] %s"
 msgstr "[Karisik Haberler - %s] %s"
 
-#: include/language.h:38
-msgid "does not expire"
-msgstr "zaman aşımı yok"
-
-#: src/misc.cpp:311
+#: src/misc.cpp:270
 msgid "expires at next database update"
 msgstr "bir sonraki veritabanı güncellemesinde zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d day"
 msgstr "%d gün sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:320
+#: src/misc.cpp:279
 #, c-format
 msgid "expires in %d days"
 msgstr "%d gün sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minute"
 msgstr "%d saat, %d dakika sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hour, %d minutes"
 msgstr "%d saat, %d dakika sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minute"
 msgstr "%d saat, %d dakika sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:334
+#: src/misc.cpp:293
 #, c-format
 msgid "expires in %d hours, %d minutes"
 msgstr "%d saat, %d dakika sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minute"
 msgstr "%d dakika sonra zaman aşımı süresi dolacak"
 
-#: src/misc.cpp:327
+#: src/misc.cpp:286
 #, c-format
 msgid "expires in %d minutes"
 msgstr "%d dakika sonra zaman aşımı süresi dolacak"
 
-#: modules/core/hs_del.cpp:38
+#: modules/core/hs_del.cpp:39
 #, c-format
 msgid "vhost for %s removed."
 msgstr "vhost for %s removed."
 
-#: modules/core/hs_set.cpp:90
+#: modules/core/hs_set.cpp:91
 #, c-format
 msgid "vhost for %s set to %s."
 msgstr "vhost for %s set to %s."
 
-#: modules/core/hs_set.cpp:88
+#: modules/core/hs_set.cpp:89
 #, c-format
 msgid "vhost for %s set to %s@%s."
 msgstr "vhost for %s set to %s@%s."
 
-#: modules/core/hs_setall.cpp:50 modules/core/hs_setall.cpp:99
+#: modules/core/hs_setall.cpp:51 modules/core/hs_setall.cpp:100
 #, c-format
 msgid "vhost for group %s set to %s."
 msgstr "vhost for group %s set to %s."
 
-#: modules/core/hs_setall.cpp:97
+#: modules/core/hs_setall.cpp:98
 #, c-format
 msgid "vhost for group %s set to %s@%s."
 msgstr "vhost for group %s set to %s@%s."
 
-#: modules/core/hs_delall.cpp:43
+#: modules/core/hs_delall.cpp:44
 #, c-format
 msgid "vhosts for group %s have been removed."
 msgstr "vhosts for group %s have been removed."
 
-#: modules/core/cs_info.cpp:96
+#: modules/core/cs_info.cpp:97
 msgid "xOP lists system"
 msgstr "xOP sistemi"
 
-#: modules/core/cs_set_xop.cpp:70 modules/core/cs_set_xop.cpp:77
+#: modules/core/cs_set_xop.cpp:78
 #, fuzzy, c-format
-msgid "xOP lists system for %s is now ."
+msgid "xOP lists system for %s is now off."
 msgstr "xOP lists system for %s is now ON."
 
-#: modules/core/cs_set_xop.cpp:31
+#: modules/core/cs_set_xop.cpp:71
+#, fuzzy, c-format
+msgid "xOP lists system for %s is now on."
+msgstr "xOP lists system for %s is now ON."
+
+#: modules/core/cs_set_xop.cpp:32
 msgid "xOP system is not available."
 msgstr "xOP system is not available."
 
@@ -11251,558 +11192,3 @@ msgstr "xOP system is not available."
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | kanaladı} mesaj"
 
-#~ msgid "%s added to %s AOP list."
-#~ msgstr "%s %s kanalinin AOP listesine eklenmistir."
-
-#~ msgid "%s added to %s HOP list."
-#~ msgstr "%s %s kanali HOP listesine eklendi."
-
-#~ msgid "%s added to %s QOP list."
-#~ msgstr "%s added to %s QOP list."
-
-#~ msgid "%s added to %s SOP list."
-#~ msgstr "%s %s kanali SOP listesine eklendi."
-
-#~ msgid "%s added to %s VOP list."
-#~ msgstr "%s %s kanali VOP listesine eklendi."
-
-#~ msgid "%s deleted from %s HOP list."
-#~ msgstr "%s %s kanali HOP listesinden silindi."
-
-#~ msgid "%s deleted from %s QOP list."
-#~ msgstr "%s deleted from %s QOP list."
-
-#~ msgid "%s deleted from %s SOP list."
-#~ msgstr "%s %s kanali SOP listesinden silindi."
-
-#~ msgid "%s deleted from %s VOP list."
-#~ msgstr "%s %s kanali VOP listesinden silindi."
-
-#~ msgid "%s moved to %s HOP list."
-#~ msgstr "%s moved to %s HOP list."
-
-#~ msgid "%s moved to %s QOP list."
-#~ msgstr "%s moved to %s QOP list."
-
-#~ msgid "%s moved to %s SOP list."
-#~ msgstr "%s moved to %s SOP list."
-
-#~ msgid "%s moved to %s VOP list."
-#~ msgstr "%s moved to %s VOP list."
-
-#~ msgid "%s not found on %s HOP list."
-#~ msgstr "%s %s kanali HOP listesinde bulunamadi."
-
-#~ msgid "%s not found on %s QOP list."
-#~ msgstr "%s not found on %s QOP list."
-
-#~ msgid "%s not found on %s SOP list."
-#~ msgstr "%s %s kanali SOP listesinde bulunamadi."
-
-#~ msgid "%s not found on %s VOP list."
-#~ msgstr "%s %s kanali VOP listesinde bulunamadi."
-
-#, fuzzy
-#~ msgid "    ENTRYMSG   Manage the channel's entrymsgs"
-#~ msgstr "    PERSIST       Set the channel as permanent"
-
-#~ msgid ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-#~ msgstr ""
-#~ "    LANGUAGE   Set the language Services will use when\n"
-#~ "               sending messages to nickname"
-
-#~ msgid ""
-#~ "    PRIVATE    Prevent your nickname from appearing in a\n"
-#~ "                   %s%s LIST"
-#~ msgstr ""
-#~ "    PRIVATE    Nickinizin /msg %s LIST yazıldığında görünmesini\n"
-#~ "                  engeller"
-
-#~ msgid "    SQLSYNC     Import your databases to SQL"
-#~ msgstr "    SQLSYNC     Import your databases to SQL"
-
-#~ msgid "%d days"
-#~ msgstr "%d gün"
-
-#~ msgid "%d hours"
-#~ msgstr "%d saat"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d dakika"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d saniye"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%s HOP list is empty."
-#~ msgstr "%s kanali HOP listesi bos."
-
-#~ msgid "%s QOP list is empty."
-#~ msgstr "%s QOP list is empty."
-
-#~ msgid "%s SOP list is empty."
-#~ msgstr "%s kanali SOP listesi bos."
-
-#~ msgid "%s VOP list is empty."
-#~ msgstr "%s kanali VOP listesi bos."
-
-#~ msgid "1 day"
-#~ msgstr "1 gün"
-
-#~ msgid "1 hour"
-#~ msgstr "1 saat"
-
-#~ msgid "1 minute"
-#~ msgstr "1 dakika"
-
-#~ msgid "1 second"
-#~ msgstr "1 saniye"
-
-#, fuzzy
-#~ msgid "Allowed to use CLEARUSERS command"
-#~ msgstr "CLEAR komutunu kullanmaya izinlidir."
-
-#~ msgid "Allowed to use HALFOP/DEHALFOP commands"
-#~ msgstr "HALFOP/DEHALFOP komutlarını kullanmaya izinlidir."
-
-#~ msgid "Channel %s HOP list has been cleared."
-#~ msgstr "Kanal %s HOP listesi temizlendi."
-
-#~ msgid "Channel %s QOP list has been cleared."
-#~ msgstr "Channel %s QOP list has been cleared."
-
-#~ msgid "Channel %s SOP list has been cleared."
-#~ msgstr "Kanal %s SOP listesi temizlendi."
-
-#~ msgid "Channel %s VOP list has been cleared."
-#~ msgstr "Kanal %s VOP listesi temizlendi."
-
-#~ msgid "Deleted %d entries from %s HOP list."
-#~ msgstr "Deleted %d entries from %s HOP list."
-
-#~ msgid "Deleted %d entries from %s QOP list."
-#~ msgstr "Deleted %d entries from %s QOP list."
-
-#~ msgid "Deleted %d entries from %s SOP list."
-#~ msgstr "Deleted %d entries from %s SOP list."
-
-#~ msgid "Deleted %d entries from %s VOP list."
-#~ msgstr "Silindi %d VOP listesinden kayit %s kanali."
-
-#~ msgid "Deleted 1 entry from %s HOP list."
-#~ msgstr "%s kanali HOP listesinden 1 kayit silindi."
-
-#~ msgid "Deleted 1 entry from %s QOP list."
-#~ msgstr "Deleted 1 entry from %s QOP list."
-
-#~ msgid "Deleted 1 entry from %s SOP list."
-#~ msgstr "%s kanali SOP listesinden 1 kayit silindi."
-
-#~ msgid "Deleted 1 entry from %s VOP list."
-#~ msgstr "%s kanali VOP listesinden 1 kayit silindi."
-
-#~ msgid "E-mail address unset."
-#~ msgstr "E-mail adresi silindi."
-
-#, fuzzy
-#~ msgid "ENTRYMSG channel {ADD|DEL|LIST|CLEAR} [message|num]"
-#~ msgstr "SOP kanaladi {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
-
-#, fuzzy
-#~ msgid "End of entry message list."
-#~ msgstr "Kullanıcı listesi sonu."
-
-#, fuzzy
-#~ msgid "Entry message %i for %s deleted."
-#~ msgstr "%s kanalının giriş mesajı kaldırıldı."
-
-#, fuzzy
-#~ msgid "Entry message %s not found on channel %s."
-#~ msgstr "Bot %s kanalında değil."
-
-#, fuzzy
-#~ msgid "Entry message added to %s"
-#~ msgstr "   Giriş mesajı: %s"
-
-#, fuzzy
-#~ msgid "Entry message list for %s is empty."
-#~ msgstr "Access list for %s is empty."
-
-#, fuzzy
-#~ msgid "Entry message list for %s:"
-#~ msgstr "%s nickinin access listesi:"
-
-#, fuzzy
-#~ msgid "Entry messages for %s have been cleared."
-#~ msgstr "%s kanalının giriş mesajı değiştirildi."
-
-#~ msgid "Fantasy mode is now OFF on channel %s."
-#~ msgstr "Fantazi modu %s kanalında KAPALI."
-
-#~ msgid "Greet mode is now OFF on channel %s."
-#~ msgstr "Karşılama modu %s kanalında KAPALI."
-
-#~ msgid ""
-#~ "HOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s kanali HOP listesi:\n"
-#~ "  Num  Nick"
-
-#~ msgid ""
-#~ "Hi %s\n"
-#~ " \n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ " \n"
-#~ "Memo text:\n"
-#~ " \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi %s\n"
-#~ "\n"
-#~ "You've just received a new memo from %s. This is memo number %d.\n"
-#~ "\n"
-#~ "Memo text:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type %s%s CONFIRM %s\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to have the password for %s reset.\n"
-#~ "To reset your password, type /msg %s CONFIRM %s\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to receive the password of nickname %s by e-mail.\n"
-#~ "The password is %s. For security purposes, you should change it as soon "
-#~ "as you receive this mail.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid ""
-#~ "Hi,\n"
-#~ " \n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" %s%s confirm %s \" to complete registration.\n"
-#~ " \n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ " \n"
-#~ "%s administrators."
-#~ msgstr ""
-#~ "Hi,\n"
-#~ "\n"
-#~ "You have requested to register the nickname %s on %s.\n"
-#~ "Please type \" /msg %s confirm %s \" to complete registration.\n"
-#~ "\n"
-#~ "If you don't know why this mail was sent to you, please ignore it "
-#~ "silently.\n"
-#~ "\n"
-#~ "%s administrators."
-
-#~ msgid "Internal error - unable to process request."
-#~ msgstr "Dahili hata - Kullanıcı kaydı bulunamadı."
-
-#~ msgid "Logon news item #%d deleted."
-#~ msgstr "Bağlantı haberleri maddesi #%d silindi."
-
-#~ msgid "Nickname %s not registered."
-#~ msgstr "Nickname %s not registered."
-
-#~ msgid "Nickname Registration (%s)"
-#~ msgstr "Nickname Registration (%s)"
-
-#~ msgid "Nickname password (%s)"
-#~ msgstr "Nick şifresi (%s)"
-
-#~ msgid "No # found in front of channel name."
-#~ msgstr "No # found in front of channel name."
-
-#~ msgid "No Bot mode is now OFF on channel %s."
-#~ msgstr "Bot yok modu %s kanalı için KAPALI."
-
-#~ msgid "No matching entries on %s HOP list."
-#~ msgstr "%s kanali HOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "No matching entries on %s QOP list."
-#~ msgstr "No matching entries on %s QOP list."
-
-#~ msgid "No matching entries on %s SOP list."
-#~ msgstr "%s kanali SOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "No matching entries on %s VOP list."
-#~ msgstr "%s kanali VOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "No such entry (#%d) on %s AOP list."
-#~ msgstr "(#%d) %s kanalinin AOP listesinde böyle bir kayit bulunamadi."
-
-#~ msgid "No such entry (#%d) on %s HOP list."
-#~ msgstr "(#%d) %s kanali HOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "No such entry (#%d) on %s QOP list."
-#~ msgstr "No such entry (#%d) on %s QOP list."
-
-#~ msgid "No such entry (#%d) on %s SOP list."
-#~ msgstr "(#%d) %s kanali SOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "No such entry (#%d) on %s VOP list."
-#~ msgstr "(#%d) %s kanali VOP listesinde uyusan kayit bulunamadi."
-
-#~ msgid "Op-notice option for %s is now OFF."
-#~ msgstr "Op-notice option for %s is now OFF."
-
-#~ msgid "Peace option for %s is now OFF."
-#~ msgstr "Peace option for %s is now OFF."
-
-#, fuzzy
-#~ msgid "Please wait %d seconds before requesting a new vHost"
-#~ msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
-
-#~ msgid "Private mode of bot %s is now OFF."
-#~ msgstr "%s botunun özel seçenegi artik KAPALI."
-
-#~ msgid "Private option for %s is now OFF."
-#~ msgstr "Private option for %s is now OFF."
-
-#~ msgid "Private option is now OFF for %s."
-#~ msgstr "Private option is now OFF for %s."
-
-#~ msgid "Protection is now OFF for %s."
-#~ msgstr "Protection is now OFF for %s."
-
-#~ msgid "Protection is now ON, with no delay."
-#~ msgstr "Anında kill koruması: AKTİF."
-
-#~ msgid ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "QOP list for %s:\n"
-#~ "  Num  Nick"
-
-#~ msgid "REGISTER password [email]"
-#~ msgstr "REGISTER şifreniz [emailiniz]"
-
-#~ msgid "Restricted access option for %s is now OFF."
-#~ msgstr "Restricted access option for %s is now OFF."
-
-#~ msgid ""
-#~ "SOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s kanali SOP listesi:\n"
-#~ "  Num  Nick"
-
-#~ msgid "STATUS ERROR Channel %s not registered"
-#~ msgstr "STATUS ERROR Channel %s not registered"
-
-#~ msgid "SUSPEND channel [reason]"
-#~ msgstr "SUSPEND channel [reason]"
-
-#~ msgid "Secure founder option for %s is now OFF."
-#~ msgstr "Secure founder option for %s is now OFF."
-
-#~ msgid "Secure ops option for %s is now OFF."
-#~ msgstr "Secure ops option for %s is now OFF."
-
-#~ msgid "Secure option for %s is now OFF."
-#~ msgstr "Secure option for %s is now OFF."
-
-#~ msgid "Secure option is now OFF for %s."
-#~ msgstr "Secure option is now OFF for %s."
-
-#~ msgid ""
-#~ "Services is unable to change modes.  Are your servers configured "
-#~ "correctly?"
-#~ msgstr ""
-#~ "Servisler mod değiştiremiyor.  Serverin doğru ayarlandığına emin olun."
-
-#~ msgid "Services up %d day, %02d:%02d"
-#~ msgstr "Servisler %d gündür çalışıyor, %02d:%02d"
-
-#~ msgid "Services up %d hour, %d minute"
-#~ msgstr "Servisler %d saat, %d dakikadır çalışıyor."
-
-#~ msgid "Services up %d hour, %d minutes"
-#~ msgstr "Servisler %d saat, %d dakikadır çalışıyor."
-
-#~ msgid "Services up %d hours, %d minute"
-#~ msgstr "Servisler %d saat, %d dakikadır çalışıyor."
-
-#~ msgid "Services up %d minute, %d second"
-#~ msgstr "Servisler %d dakika, %d saniyedir çalışıyor."
-
-#~ msgid "Services up %d minute, %d seconds"
-#~ msgstr "Servisler %d dakika, %d saniyedir çalışıyor."
-
-#~ msgid "Services up %d minutes, %d second"
-#~ msgstr "Servisler %d dakika, %d saniyedir çalışıyor."
-
-#~ msgid "Signed kick option for %s is now OFF."
-#~ msgstr "Signed kick option for %s is now OFF."
-
-#~ msgid "Sorry, channel HOP list modification is temporarily disabled."
-#~ msgstr "Kanal HOP listesi degisiklikleri geçici olarak devre disidir."
-
-#~ msgid "Sorry, channel QOP list modification is temporarily disabled."
-#~ msgstr "Sorry, channel QOP list modification is temporarily disabled."
-
-#~ msgid "Sorry, channel SOP list modification is temporarily disabled."
-#~ msgstr "Kanal SOP listesi degisikligi geçici olarak devre disidir."
-
-#~ msgid "Sorry, channel VOP list modification is temporarily disabled."
-#~ msgstr "Kanal VOP listesi degisikligi geçici olarak devre disidir."
-
-#~ msgid "Sorry, you can only have %d AOP/SOP/VOP entries on a channel."
-#~ msgstr "Bir kanala toplam %d AOP/SOP/VOP kayit edilebilir."
-
-#~ msgid "Symbiosis mode is now OFF on channel %s."
-#~ msgstr "Gerçek bot modu %s kanalında KAPALI."
-
-#, fuzzy
-#~ msgid "Syntax: APPENDTOPIC channel text"
-#~ msgstr "Kullanımı: RANDOMNEWS ADD yazi"
-
-#, fuzzy
-#~ msgid "Syntax: ENFORCE channel [what]"
-#~ msgstr "CLEAR kanaladı neyi"
-
-#, fuzzy
-#~ msgid "Syntax: REQUEST vhost"
-#~ msgstr "Kullanımı: OPERNEWS ADD yazı"
-
-#~ msgid ""
-#~ "Syntax: SET DEBUG {ON | OFF | num}\n"
-#~ " \n"
-#~ "Sets debug mode on or off.  In debug mode, all data sent to\n"
-#~ "and from Services as well as a number of other debugging\n"
-#~ "messages are written to the log file.  If num is\n"
-#~ "given, debug mode is activated, with the debugging level set\n"
-#~ "to num.\n"
-#~ "This option is equivalent to the command-line option\n"
-#~ "-debug."
-#~ msgstr ""
-#~ "Kullanımı: SET DEBUG {ON | OFF | num}\n"
-#~ "\n"
-#~ "Debug modunu açar yada kapatır. Debug modunda, servislere \n"
-#~ "gönderilen ve alınan tüm veriler diğer bir kaç debug \n"
-#~ "mesajlarıyla beraber bir kayıt dosyasına yazılır. Eğer num \n"
-#~ "parametresi belirtilmişse, debug modu num a bağlı debug \n"
-#~ "seviye ayarı ile aktifleştirilir.\n"
-#~ "\n"
-#~ "-debug komut satırı özelliğiyle aynıdır."
-
-#~ msgid ""
-#~ "Syntax: SQLSYNC\n"
-#~ " \n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-#~ msgstr ""
-#~ "Syntax: SQLSYNC\n"
-#~ "\n"
-#~ "This command syncs your databases with SQL. You should\n"
-#~ "only have to execute this command once, when you initially\n"
-#~ "import your databases into SQL."
-
-#, fuzzy
-#~ msgid "Syntax: WAITING"
-#~ msgstr "Kullanımı: %s"
-
-#, fuzzy
-#~ msgid "The entry message list for %s is full."
-#~ msgstr "Greet message for %s unset."
-
-#~ msgid "This module can not be unloaded."
-#~ msgstr "This module can not be unloaded."
-
-#~ msgid "Topic lock option for %s is now OFF."
-#~ msgstr "Topic lock option for %s is now OFF."
-
-#~ msgid "Topic retention option for %s is now OFF."
-#~ msgstr "Topic retention option for %s is now OFF."
-
-#~ msgid "Unknown command %s."
-#~ msgstr "Varolmayan komut %s."
-
-#~ msgid ""
-#~ "Unknown option %s.\n"
-#~ "Type %s%s HELP KICK for more information."
-#~ msgstr ""
-#~ "Varolmayan özellik %s.\n"
-#~ "Daha fazla bilgi için /msg %s HELP KICK yazın."
-
-#~ msgid "Updating MySQL."
-#~ msgstr "Updating MySQL."
-
-#~ msgid "User %s not found in the nickserv db."
-#~ msgstr "User %s not found in the nickserv db."
-
-#~ msgid ""
-#~ "VOP list for %s:\n"
-#~ "  Num  Nick"
-#~ msgstr ""
-#~ "%s kanali VOP listesi:\n"
-#~ "  Num  Nick"
-
-#, fuzzy
-#~ msgid "Your vHost has been requested"
-#~ msgstr "%s botu silindi."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been approved."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] Your requested vHost has been rejected."
-#~ msgstr "[auto-memo] The memo you sent to %s has been viewed."
-
-#, fuzzy
-#~ msgid "[auto memo] vHost %s has been requested."
-#~ msgstr "%s nickine gönderilen son mesaj iptal edildi."
-
-#, fuzzy
-#~ msgid "vHost for %s has been activated"
-#~ msgstr "Your vhost of %s is now activated."
-
-#, fuzzy
-#~ msgid "vHost for %s has been rejected"
-#~ msgstr "%s botu silindi."
-
-#~ msgid "xOP lists system for %s is now OFF."
-#~ msgstr "xOP lists system for %s is now OFF."