diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po
index 276cf6fad..f184f814f 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 20:12-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Catalan\n"
@@ -56,7 +56,7 @@ msgstr "%s afegida a  la llista de paraules malsonants de  %s."
 msgid "%s added to %s's access list."
 msgstr "%s afegit a la teva lllista d'accés."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s afegit a la teva lllista d'accés."
@@ -76,11 +76,6 @@ msgstr "%s afegit a la llista de AKILLs."
 msgid "%s added to the AKILL list."
 msgstr "%s afegit a la llista de AKILLs."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "%s afegit a la teva lllista d'accés."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -112,7 +107,7 @@ msgstr ""
 "informació sobre un comanda especifica, escriu  \n"
 "/msg %s HELP comanda."
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -129,7 +124,7 @@ msgstr ""
 "per més informació sobre una comanda especifica\n"
 "escriu /msg %s HELP comanda."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -222,7 +217,7 @@ msgstr "%s esborrada de la llista de paraules malsonants de %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s esborrat de la llista d'accés de %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s esborrat de la teva lllista d'accés."
@@ -243,11 +238,6 @@ msgstr "%s esborrat de la llista AOP de %s."
 msgid "%s deleted from the AKILL list."
 msgstr "%s esborrat de la llista de AKILLs."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s esborrat de la teva lllista d'accés."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -331,7 +321,7 @@ msgstr "%s afegit a la teva lllista d'accés."
 msgid "%s is already suspended."
 msgstr "You are already in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s no és un bot valid o un canal registrat."
@@ -398,7 +388,7 @@ msgstr "%s afegit a la llista de kicks automàtics en el canal %s."
 msgid "%s not found on %s %s list."
 msgstr "%s no trobat a la llista AOP de %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no trobat a la llista d'accés de %s."
@@ -418,7 +408,7 @@ msgstr "%s no trobada a la llista de paraules malsonants de %s."
 msgid "%s not found on %s's access list."
 msgstr "%s no trobat a la llista d'accés de %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s no trobat a la teva lllista d'accés."
@@ -597,6 +587,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP grup clau"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -606,11 +601,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP canal"
@@ -640,8 +635,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel modes"
 msgstr "MODE canal Modes"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN canal [nick]"
@@ -685,7 +680,7 @@ msgstr "MODE canal Modes"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE canal Modes"
@@ -704,9 +699,9 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel APPEND topic"
 msgstr "TOPIC canal [tòpic]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP canal"
@@ -721,12 +716,12 @@ msgstr "TOPIC canal [tòpic]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP canal"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE canal Modes"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [canal] {numero | llista | ALL}"
@@ -745,7 +740,7 @@ msgstr "DEL [canal] {numero | llista | ALL}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP canal"
@@ -755,8 +750,8 @@ msgstr "DROP canal"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
@@ -803,12 +798,12 @@ msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | instància]"
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [canal] {numero | llista | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER canal descripció"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN canal [nick]"
@@ -838,8 +833,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP canal"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET canal XOP {ON | OFF}"
@@ -876,13 +871,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
@@ -891,7 +886,7 @@ msgstr "SET canal XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE numero"
@@ -906,8 +901,8 @@ msgstr "STAFF memo-text"
 msgid "message"
 msgstr "GLOBAL missatge"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -920,10 +915,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP grup clau"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO nick"
@@ -953,13 +948,13 @@ msgstr "SVSNICK nick newnick "
 msgid "nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK nickname"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID nickname rao"
@@ -969,7 +964,7 @@ msgstr "FORBID nickname rao"
 msgid "nickname email"
 msgstr "FORBID nickname rao"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID nickname rao"
@@ -1009,15 +1004,15 @@ msgstr "FORBID nickname rao"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
@@ -1086,11 +1081,6 @@ msgstr "LIST patro [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE nom-del-servidor [raó]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP grup clau"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1101,7 +1091,7 @@ msgstr "MODE canal Modes"
 msgid "user [reason]"
 msgstr "JUPE nom-del-servidor [raó]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1247,7 +1237,7 @@ msgstr ""
 "\n"
 "Limitat a operadors de serveis."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1386,7 +1376,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1783,7 +1773,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1839,7 +1829,7 @@ msgstr "%d bots disponibles."
 msgid "%d modules loaded."
 msgstr "%d Modules loaded."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nicknames en el grup."
@@ -1942,9 +1932,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "            Caps kicker : %s (mínim %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "La llista d'accés de %s esta buida."
@@ -1975,8 +1965,8 @@ msgstr "La llista de paraules malsonants de %s esta buida."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s no pot ser el sucessor en el canal %s ja que n'es el fundador."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "%s commands:"
@@ -2247,7 +2237,7 @@ msgstr "La llista de kicks automàtics del canal %s esta buida."
 msgid "%s's auto join list:"
 msgstr "    AKICK      Manté la llista d'AutoKick"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Your access list is empty."
@@ -2353,7 +2343,7 @@ msgstr "%s Esta actualment online."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2421,17 +2411,17 @@ msgstr "CHANKILL [+expiry] {#channel} [reason]"
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID nickname rao"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID nickname rao"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
@@ -2513,7 +2503,7 @@ msgstr "Opcions del nivell d'accés pel canal %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Nivells d'accés per a %s canviats als valors originals."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "Lllista d'accés per %s:"
@@ -2650,7 +2640,7 @@ msgstr "All memos for channel %s have been deleted."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2683,12 +2673,12 @@ msgstr "All vhost's in the group %s have been set to %s"
 msgid "All user modes on %s have been synced."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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"
@@ -3142,7 +3132,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3155,7 +3145,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3317,12 +3307,12 @@ msgstr "    EMAIL      Associa un E-mail amb el teu nickname"
 msgid "Associate oper info with a nick or channel"
 msgstr "ASSIGN             Assigna un bot a un canal"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      Associa un E-mail amb el teu nickname"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3335,7 +3325,7 @@ msgstr ""
 "sera mostrat quant algu demani informació\n"
 "sobre el teu nick amb la comanda INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3645,8 +3635,8 @@ msgstr "El bot ja no kickejara flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "El bot ja no kickejara repeticions."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3690,7 +3680,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Bot kickejara ops en el canal %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar email ara; per favor intenta en uns instants."
 
@@ -3775,7 +3765,7 @@ msgstr ""
 "\n"
 "Limitat a administradors de serveis."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Lllista d'accés per %s:"
@@ -3789,7 +3779,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s changed your usermodes."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr ""
@@ -3841,7 +3831,7 @@ msgstr ""
 "Canvia el fundador d'un canal. El nou nickname ha de\n"
 "ser un d'enregistrat."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3856,7 +3846,7 @@ msgstr ""
 "numero ha de ser escollit de la llista de llenguatges\n"
 "soportats:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3909,7 +3899,7 @@ msgstr ""
 "si no hi haguès un successor. El nou nickname ha de ser un\n"
 "d'enregistrat."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP canal"
@@ -3994,7 +3984,7 @@ 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/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La llista d'accés pel canal %s ha estat netegada."
@@ -4031,8 +4021,8 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s no trobat a la llista d'accés de %s."
@@ -4213,7 +4203,7 @@ msgstr "    CONFIRM    Confirm a nickserv auth code"
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  neteja els Modes d'un canal"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4232,21 +4222,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "    Creat : %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "    Creat : %s"
@@ -4305,7 +4295,7 @@ msgstr "GROUP grup clau"
 msgid "DEL [nickname] channel"
 msgstr "MODE canal Modes"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID nickname rao"
@@ -4315,8 +4305,8 @@ msgstr "FORBID nickname rao"
 msgid "DEL [nickname] mask"
 msgstr "MODE canal Modes"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [canal] {numero | llista | ALL}"
@@ -4649,8 +4639,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "La descripció de %s canviada a%s."
@@ -4808,12 +4798,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
@@ -4902,7 +4892,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4941,14 +4931,14 @@ msgstr ""
 "sorti del canal, i sigui restaurat la pròxima vegada que\n"
 "el canal sigui creat."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5159,7 +5149,7 @@ msgstr "Fi de la llista de canals."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Fi de la llista d'usuaris."
@@ -5179,7 +5169,7 @@ msgstr "Fi de la llista d'usuaris."
 msgid "End of list - %d channels shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fi de la lllista - %d/%d resultat(s) mostrat(s)."
@@ -5214,37 +5204,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Catala"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Greet message for %s unset."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Mode fantasia ara activada en el canal %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Greet message for %s changed to %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "Lllista d'accés per %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "All memos for channel %s have been deleted."
@@ -5268,7 +5258,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5294,12 +5284,12 @@ msgstr "Excepció per a %s (#%d) moguda a la posició %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "Expires in: %s"
@@ -5314,7 +5304,7 @@ msgstr "Exception for %s has been updated to %d."
 msgid "Expiry for %s updated."
 msgstr "Temps d'expiració per a %s canviat."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasia"
 
@@ -5333,11 +5323,16 @@ msgstr "Mode fantasia ara activada en el canal %s."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "La mascara %s ja esta present a la teva lllista d'accés."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "You are already in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5571,12 +5566,12 @@ msgstr "La llista ignore esta buida."
 msgid "Ignore list:"
 msgstr "Llista de bots:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Protecció de Voices"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "      \t\tAdreça E-mail: %s"
@@ -5665,17 +5660,17 @@ msgstr "         Italics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Ingresa en un grup"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Mode de missatge"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Peace option for %s is now ON."
@@ -5694,7 +5689,7 @@ msgstr "Key for channel %s is %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Kickeja un usuari d'un canal"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5736,8 +5731,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [canal] [llista | NEW]"
@@ -5747,8 +5742,8 @@ msgstr "LIST [canal] [llista | NEW]"
 msgid "LIST [mask | list]"
 msgstr "LIST [canal] [llista | NEW]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK nickname"
@@ -5757,7 +5752,7 @@ msgstr "CHECK nickname"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [text|numero]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Llenguatge canviat a Català."
 
@@ -5771,7 +5766,7 @@ msgstr "Ultim memo enviat a %s va ser cancel.lat."
 msgid "Last quit message"
 msgstr "   Ùltim missatge quit: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "      Ultima vegada vist: %s"
@@ -5785,7 +5780,7 @@ msgstr "Ultima adreça vista: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "      Ultima vegada vist: %s"
@@ -5815,8 +5810,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivell ha d'estar entre %d i %d inclosos."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5841,17 +5836,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "Lllista de nicknames en el grup de %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lllista de nicknames en el grup de %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Lllista de nicknames en el teu grup:"
 
@@ -5907,7 +5902,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "Lllista de nicknames en el teu grup:"
@@ -6408,7 +6403,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6443,15 +6438,15 @@ msgstr "    DEFCON      Manipulate the DefCon system"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6464,8 +6459,8 @@ msgstr "La mascara %s ja esta present a la teva lllista d'accés."
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "La mascara %s ja esta present a la teva lllista d'accés."
@@ -6517,7 +6512,7 @@ msgstr "Límite de memos per a %s establert a %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Límit de memos per a %s establert a 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviat a %s."
@@ -6527,12 +6522,12 @@ msgstr "Memo enviat a %s."
 msgid "Memos for %s:"
 msgstr "      Mode de lock: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL missatge"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Mode de missatge"
 
@@ -6614,7 +6609,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra la llista d'accés actual."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6639,12 +6634,12 @@ msgstr "    AOP        Modifica la llista d'usuaris AOP"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica la llista d'adreçes autoritzades"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS     Modifica la llista d'usuaris privilegiats"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Modify the Services ignore list"
@@ -6698,10 +6693,10 @@ msgstr "Module: %s Version: %s Author: %s loaded: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6718,9 +6713,9 @@ msgstr "Lllista d'accés per %s:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO nick"
@@ -6785,12 +6780,12 @@ msgstr "Nickname %s registered."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
@@ -6805,7 +6800,7 @@ msgstr "Nick %s doesn't have a memo from you."
 msgid "Nick %s has been logged out."
 msgstr "Nick %s ha estat desconnectat."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6815,7 +6810,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6855,17 +6850,17 @@ msgstr "El canal %s ja esta enregistrat!"
 msgid "Nickname %s may not be registered."
 msgstr "El canal %s no pot ser enregistrat."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "El nickname %s ja esta registrat sota el teu compte: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6874,7 +6869,7 @@ msgstr "Auto-op"
 msgid "No bot"
 msgstr "Sense bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "no expira"
@@ -6908,8 +6903,8 @@ msgstr "No Emails listed for %s."
 msgid "No matching entries on %s %s list."
 msgstr "No existeixen instàncies coincidents a la llista AOP de %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, 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 ."
@@ -6986,8 +6981,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Lllista d'accés per %s:"
@@ -6997,7 +6992,7 @@ msgstr "Lllista d'accés per %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Changed usermodes of %s."
@@ -7025,17 +7020,17 @@ msgstr "Cap"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7161,12 +7156,12 @@ msgstr "La clau per %s es %s."
 msgid "Password incorrect."
 msgstr "Clau incorrecta."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Pau"
 
@@ -7180,7 +7175,7 @@ msgstr "Peace option for %s is now ON."
 msgid "Peace option for %s is now on."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7217,19 +7212,19 @@ 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."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
 "Per favor espera %d segons abans d'utilizar la comanda SEND un altre cop."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -7278,7 +7273,7 @@ msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
@@ -7287,8 +7282,8 @@ msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privat"
 
@@ -7332,26 +7327,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Protecció"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Protection is now ON for %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
@@ -7368,7 +7363,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Protecció de Voices"
@@ -7414,11 +7409,11 @@ msgstr "    READ   Llegeix un o més memos"
 msgid "Real name"
 msgstr "  Nom real : %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7447,14 +7442,14 @@ msgstr "    LEVELS     Redefine el significat de nivells d'accés"
 msgid "Regains control of your nick"
 msgstr "    RELEASE    Repren possesió del teu nick després de RECOVER"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s is enable"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7462,8 +7457,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7539,7 +7534,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7638,7 +7633,7 @@ msgstr "    MODLOAD     Load a module"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Recarrega la configuració dels serveis"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7718,7 +7713,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Recarrega la configuració dels serveis"
@@ -7728,7 +7723,7 @@ msgstr "    RELOAD      Recarrega la configuració dels serveis"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Restringeix l'accés al canal"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "accés restringit"
@@ -7882,12 +7877,12 @@ msgstr "NOOP {SET|REVOKE} servidor"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Clau aceptada - Has estat reconegut."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Clau aceptada - Has estat reconegut."
@@ -7912,7 +7907,7 @@ msgstr ""
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Fundador Segur"
@@ -7927,7 +7922,7 @@ msgstr "Secure founder option for %s is now ON."
 msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Ops Segurs"
@@ -7952,12 +7947,12 @@ msgstr "Secure option for %s is now ON."
 msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
@@ -7967,7 +7962,7 @@ msgstr "Secure option is now ON for %s."
 msgid "Secureops enforced on %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Segur"
 
@@ -8019,7 +8014,7 @@ msgstr "Fundador Segur"
 msgid "Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8277,12 +8272,12 @@ msgstr "Services will no longer autoop %s in channels."
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
@@ -8357,7 +8352,7 @@ msgstr "    DISPLAY    Estableix el display del teu grup amb serveis"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       Estableix el fundador d'un canal"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8773,7 +8768,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8864,11 +8859,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Signed kick option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Kicks Signats"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s actualment te molts memos i no pot rebre'n mes."
@@ -8884,12 +8879,12 @@ msgid "Sorry, bot assignment is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a bot esta temporalment inhabilitat"
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Ho sento, la modificació de bots esta temporalment inabilitada."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Ho sento, l'establiment d'opcions per a bot esta temporalment inhabilitat"
@@ -8902,7 +8897,7 @@ msgstr ""
 "Ho sento, la modificació de la llista AOP de canals esta\n"
 "temporalment deshabilitada."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Ho sento, la modificació d'accés a canals esta temporalment inabilitada."
@@ -8947,7 +8942,7 @@ msgstr ""
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Ho sento, desenregistrament de nickname esta temporalment inhabilitat."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Ho sento, La agrupació de nicks esta temporalment inabilitada."
 
@@ -8966,15 +8961,15 @@ msgstr ""
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr ""
 "Ho sento, sols pots tenir %d instàncies a la teva lllista d'accés per "
 "nickname."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -9114,7 +9109,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Syncs the vhost for all nicks in a group"
@@ -9123,7 +9118,7 @@ msgstr "    GROUP       Syncs the vhost for all nicks in a group"
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -9134,7 +9129,7 @@ msgstr ""
 "\n"
 "Llista tots els nicks en el teu grup."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9370,7 +9365,7 @@ msgstr ""
 "comanda abans d'utilitzar-les. La clau hauria de ser la mateixa\n"
 "que va ser enviada amb la comanda REGISTER."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9566,21 +9561,21 @@ 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/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9588,13 +9583,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "The IMMED option is not available on this network."
 
@@ -9676,7 +9671,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9757,7 +9752,17 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Greet message for %s unset."
@@ -9766,15 +9771,6 @@ msgstr "Greet message for %s unset."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9907,7 +9903,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "There are %d memos on channel %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Delete the vhost for all nicks in a group"
@@ -10003,7 +9999,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -10016,7 +10012,7 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -10093,7 +10089,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10162,7 +10158,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10204,7 +10200,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10228,7 +10224,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10354,12 +10350,12 @@ msgstr "Desactiva les majuscules!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       Activa o desactiva la protecció"
@@ -10398,7 +10394,7 @@ msgstr ""
 "(D'altra banda, qualsevol persona que sapigue el teu nick podra comprobar\n"
 "la teva informació utilitzant la comanda INFO.)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10428,7 +10424,7 @@ msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     Activa o desactiva la seguretat de nickname"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10459,7 +10455,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10536,7 +10532,7 @@ msgstr ""
 "Escriu /msg %s HELP opció per més informació\n"
 "sobre una opció en particular."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10552,8 +10548,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Unable to remove module %s"
@@ -10778,8 +10774,8 @@ msgstr "vhost for group %s set to %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [canal] [llista | NEW]"
@@ -10928,12 +10924,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ja ets membre del grup de %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "You are already identified."
 
@@ -10961,6 +10957,11 @@ msgstr "No estas autoritzat a canviar el teu límit de memos."
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autoritzat a canviar el teu límit de memos."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "You are already identified."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10970,7 +10971,7 @@ msgstr "You are now a SuperAdmin"
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -11034,8 +11035,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "No pots fer GHOST a tu mateix!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "No hi ha instàncies que concordin a la llista d'accés de %s ."
@@ -11045,7 +11046,7 @@ msgstr "No hi ha instàncies que concordin a la llista d'accés de %s ."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Can't logout %s because he's a services operator."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
@@ -11060,7 +11061,7 @@ msgstr "No pots establir el límite de memos per %s mes de %d."
 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/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
 
@@ -11131,7 +11132,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Escriu /msg %s READ %d per a llegir-lo."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "You have been invited to %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
@@ -11189,11 +11195,16 @@ msgstr "    DELALL      Delete the vhost for all nicks in a group"
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "No pots establir la teva adreça e-mail en aquesta xarxa."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11220,7 +11231,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "Can't logout %s because he's a services operator."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11251,7 +11262,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, 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."
@@ -11261,7 +11272,7 @@ msgstr "You have to be connected longer than %d seconds to register your nick."
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11271,11 +11282,6 @@ msgstr ""
 "Aquest e-mail et permetra recuperar la teva clau en\n"
 "cas de que la olvidis."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s no es un tipus de ban valid."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11332,17 +11338,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "El bot %s ha estat esborrat."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "You are already identified."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "You are already identified."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "E-mail address for %s changed to %s."
@@ -11352,7 +11358,7 @@ msgstr "E-mail address for %s changed to %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Totes les linees O de %s han estat esborrades."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11409,12 +11415,12 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "El teu nick ha estat desconnectat."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr "El teu nick ja esta registrat; escriu /msg %s DROP primer."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11423,7 +11429,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Nickname %s registered."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "El teu nickname s'esta canviant a %s"
@@ -11432,12 +11438,12 @@ msgstr "El teu nickname s'esta canviant a %s"
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La teva clau es %s - Recordala per un us futur."
@@ -11446,7 +11452,7 @@ msgstr "La teva clau es %s - Recordala per un us futur."
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
@@ -11566,7 +11572,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO nick"
@@ -11575,8 +11581,8 @@ msgstr "INFO nick"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK nickname"
@@ -11598,7 +11604,7 @@ msgstr "CHANKILL [+expiry] {#channel} [reason]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11767,7 +11773,7 @@ msgstr "UNBAN canal [nick]"
 msgid "{nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canal} text"
diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po
index 8607dd42b..8471ae4cc 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2013-06-30 13:05+0100\n"
 "Last-Translator: DukePyrolator <DukePyrolator@anope.org>\n"
 "Language-Team: German\n"
@@ -58,7 +58,7 @@ msgstr "%s zur Bad Words-Liste von %s hinzugefügt."
 msgid "%s added to %s's access list."
 msgstr "%s wurde zu %s' Access-Liste hinzugefügt."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s wurde zu Deiner Zertifikat-Liste hinzugefügt."
@@ -78,11 +78,6 @@ msgstr "%s wurde zur %s-Liste hinzugefügt."
 msgid "%s added to the AKILL list."
 msgstr "%s wurde zur AKILL-Liste hinzugefügt."
 
-#: modules/commands/ns_cert.cpp:180
-#, c-format
-msgid "%s added to your certificate list."
-msgstr "%s wurde zu Deiner Zertifikat-Liste hinzugefügt."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, fuzzy, c-format
 msgid ""
@@ -117,7 +112,7 @@ msgstr ""
 "%s%s Befehl. Für weitergehende Informationen zu\n"
 "einem bestimmten Befehl tippe %s%s %s Befehl"
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -134,7 +129,7 @@ msgstr ""
 "%s%s Befehl. Für weitergehende Informationen zu\n"
 "einem bestimmten Befehl, tippe %s%s %s Befehl."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -226,7 +221,7 @@ msgstr "%s wurde aus der Bad Words-Liste von %s entfernt."
 msgid "%s deleted from %s's access list."
 msgstr "%s wurde von der Access-Liste von %s entfernt."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s wurde von Deiner Zertifikat-Liste entfernt."
@@ -248,11 +243,6 @@ msgstr "%s wurde von der %s Liste entfernt."
 msgid "%s deleted from the AKILL list."
 msgstr "%s wurde von der AKILL-Liste entfernt."
 
-#: modules/commands/ns_cert.cpp:209
-#, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s wurde von Deiner Zertifikat-Liste entfernt."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -338,7 +328,7 @@ msgstr "%s befindet sich bereits in Deiner Ignore-Liste."
 msgid "%s is already suspended."
 msgstr "%s ist bereits in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s ist kein registrierter Nick bzw. Chatraum."
@@ -407,7 +397,7 @@ msgstr "%s wurde der AutoKick-Liste von %s hinzugefügt."
 msgid "%s not found on %s %s list."
 msgstr "%s wurde nicht auf der %s %s-Liste gefunden."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s wurde nicht auf der Access-Liste von %s gefunden."
@@ -427,7 +417,7 @@ msgstr "%s nicht in der Bad Words-Liste von %s gefunden."
 msgid "%s not found on %s's access list."
 msgstr "%s wurde auf der Access-Liste von %s nicht gefunden."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s wurde nicht auf Deiner Zertifikat-Liste gefunden."
@@ -589,6 +579,11 @@ msgstr ""
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "[auto-memo] Das Memo das Du an %s gesendet hast wurde angesehen."
 
+#: modules/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "Ziel Passwort"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr "Adresse"
@@ -597,11 +592,11 @@ msgstr "Adresse"
 msgid "botname {ON|OFF}"
 msgstr "Botname {ON|OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "Channel"
 
@@ -626,8 +621,8 @@ msgstr "Channel Maske [reason]"
 msgid "channel modes"
 msgstr "Channel Modi"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "Channel Nick"
 
@@ -666,7 +661,7 @@ msgstr "Channel ADD Nachricht"
 msgid "channel ADD mask level"
 msgstr "Channel ADD Maske Level"
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 msgid "channel ADD message"
 msgstr "Channel ADD Nachricht"
 
@@ -683,9 +678,9 @@ msgstr "Channel ADD {Nick | Maske} [Grund]"
 msgid "channel APPEND topic"
 msgstr "Channel [Topic]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr "Channel CLEAR"
 
@@ -699,11 +694,11 @@ msgstr "Channel [was]"
 msgid "channel CLEAR [ALL]"
 msgstr "Channel CLEAR"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 msgid "channel DEL num"
 msgstr "Channel DEL Nummer"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "Channel DEL {Maske | Nummer | Liste }"
 
@@ -719,7 +714,7 @@ msgstr "Channel DEL {Wort | Nummer | Liste}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr "Channel LIST"
 
@@ -727,8 +722,8 @@ msgstr "Channel LIST"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "Channel LIST [Maske | Nummer | Liste]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr "Channel LIST [Maske | Liste]"
 
@@ -770,11 +765,11 @@ msgstr "Channel VIEW [Maske | Nummer | Liste]"
 msgid "channel VIEW [mask | list]"
 msgstr "Channel VIEW [Maske | Liste}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "Channel [Beschreibung]"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "Channel [Nick]"
 
@@ -801,8 +796,8 @@ msgstr "Channel [+Bandauer [Grund]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "Channel CLEAR"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 msgid "channel {ON|OFF}"
 msgstr "Channel {ON | OFF}"
 
@@ -838,13 +833,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "Channel SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "Channel {ON | OFF}"
 
@@ -852,7 +847,7 @@ msgstr "Channel {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 msgid "language"
 msgstr "Sprache"
 
@@ -864,8 +859,8 @@ msgstr "Memo-Text"
 msgid "message"
 msgstr "Nachricht"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr "Modulname"
 
@@ -877,10 +872,10 @@ msgstr "Neues Display"
 msgid "new-password"
 msgstr "Neues Passwort"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr "Nickname"
 
@@ -906,12 +901,12 @@ msgstr "Nickname Neuer-Nickname"
 msgid "nick [reason]"
 msgstr "Channel Nick [Grund]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "Nickname"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 msgid "nickname address"
 msgstr "Nickname Mail-Adresse"
 
@@ -920,7 +915,7 @@ msgstr "Nickname Mail-Adresse"
 msgid "nickname email"
 msgstr "Nickname Nachricht"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 msgid "nickname language"
 msgstr "Nickname Sprache"
 
@@ -955,14 +950,14 @@ msgstr "Nickname [+Zeit] Grund"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "{EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "Nickname {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "Nickname {ON | QUICK | IMMED | OFF}"
 
@@ -1019,10 +1014,6 @@ msgstr "Muster [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "Servername [Grund]"
 
-#: modules/commands/ns_group.cpp:78
-msgid "target password"
-msgstr "Ziel Passwort"
-
 #: modules/commands/os_mode.cpp:139
 msgid "user modes"
 msgstr "Channel Modi"
@@ -1031,7 +1022,7 @@ msgstr "Channel Modi"
 msgid "user [reason]"
 msgstr "Nickname [Grund]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, c-format
 msgid ""
 " \n"
@@ -1131,7 +1122,7 @@ msgstr ""
 "werden, auch wenn es die Standard-Zeit ist. Die Standard-\n"
 "Auslaufzeit für einen AKILL kann man unter STATS AKILL finden.\n"
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1263,7 +1254,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -1622,7 +1613,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr " aber %s ist auf mysteriöse Weise verschwunden."
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1678,7 +1669,7 @@ msgstr "%d Bots verfügbar."
 msgid "%d modules loaded."
 msgstr "%d Module geladen."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d Nicknamen in der Gruppe."
@@ -1781,9 +1772,9 @@ msgstr "%1$s (%2$s) hat vor %4$s (%5$s) den IRC verlassen (%3$s)."
 msgid "%s (minimum %d/%d%%)"
 msgstr "%s (Minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "Die Zugriffsliste von %s ist leer."
@@ -1814,8 +1805,8 @@ msgstr "Die Bad Words-Liste von %s ist leer."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s kann nicht gleichzeitig Gründer und Nachfolger im Raum %s sein."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Befehle von %s:"
@@ -2085,7 +2076,7 @@ msgstr "Deine Autojoin-Liste ist leer."
 msgid "%s's auto join list:"
 msgstr "Deine Autojoin Liste:"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Deine Zertifikat-Liste ist leer."
@@ -2190,7 +2181,7 @@ msgstr ". %s ist noch online."
 msgid "<unknown>"
 msgstr "<unbekannt>"
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2259,17 +2250,17 @@ msgstr "ADDL [+Zeit] Maske Limit Grund"
 msgid "ADD [nickname] channel [key]"
 msgstr "ADD [Benutzer] Maske"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "Nickname Sprache"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "ADD [Benutzer] Maske"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "Nickname Sprache"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr "ADD [+Zeit] Maske Grund"
 
@@ -2346,7 +2337,7 @@ msgstr "Zugriffslevel für Channel %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Zugriffslevel für %s wurden auf Standardwerte zurückgesetzt."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, c-format
 msgid "Access list for %s:"
 msgstr "Zugriffs-Liste von %s:"
@@ -2477,7 +2468,7 @@ msgstr "Alle Memos für den Channel %s wurden gelöscht."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2510,12 +2501,12 @@ msgstr "Alle Einstellungen von %s wurden nach %s kopiert."
 msgid "All user modes on %s have been synced."
 msgstr "Alle Benutzermodi von %s wurden synchronisiert."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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."
@@ -2931,7 +2922,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -2944,7 +2935,7 @@ msgstr ""
 "(Queries), ansonsten werden die Antworten als Notices\n"
 "geschickt (Standard)."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3095,11 +3086,11 @@ msgstr "Verbindet eine eMail-Adresse mit Deinem Nicknamen"
 msgid "Associate oper info with a nick or channel"
 msgstr "Weist einem Channel einen Bot zu"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 msgid "Associates the given E-mail address with the nickname."
 msgstr "Verbindet die angegebene eMail-Adresse mit Deinem Nicknamen."
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
 "This address will be displayed whenever someone requests\n"
@@ -3110,7 +3101,7 @@ msgstr ""
 "Informationen über Deinen Nicknamen mit dem INFO \n"
 "Befehl anfordert."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3418,8 +3409,8 @@ msgid "Bot won't kick for repeats anymore."
 msgstr ""
 "Der Bot ignoriert jetzt User die sich wiederholen und wird nicht kicken."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3459,7 +3450,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Bot wird Ops kicken im %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Die Services können gerade keine Mail verschicken, bitte versuche es später "
@@ -3518,7 +3509,7 @@ msgid ""
 "send the command."
 msgstr "Lässt die Services sofort die Datenbanken speichern."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Zertifikat-Liste von %s:"
@@ -3531,7 +3522,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "Ändert die Raum Modi"
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 msgid "Change the communication method of Services"
 msgstr "Ändert die Methode, wie die Services mit Dir kommunizieren"
 
@@ -3581,7 +3572,7 @@ msgstr ""
 "Ändert den Gründer (Founder) eines Channels. Der neue\n"
 "Nickname muss registriert sein."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
@@ -3595,7 +3586,7 @@ msgstr ""
 "Die Sprache muss von der folgenden Liste der unter-\n"
 "stützten Sprachen ausgewählt werden: "
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
@@ -3639,7 +3630,7 @@ msgstr ""
 "(max %d), wird der Channel gelöscht.\n"
 "Der Nickname des Vertreters muss registriert sein."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "Channel"
@@ -3724,7 +3715,7 @@ msgstr "Der Raum %s wird nicht mehr ablaufen."
 msgid "Channel %s %s list has been cleared."
 msgstr "Die %2$s-Liste von %1$s wurde geleert."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Die Access-Liste von %s wurde geleert."
@@ -3758,8 +3749,8 @@ msgstr "Raum-Liste:"
 msgid "Channel stats for %s on %s:"
 msgstr "Statistiken für %s im Raum %s:"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s wurde nicht auf der Access-Liste von %s gefunden."
@@ -3934,7 +3925,7 @@ msgstr "Bestätigt einen Authentifizierungs Code"
 msgid "Control modes and mode locks on a channel"
 msgstr "Regelt Modi und gesperrte Modi eines Raumes"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -3951,20 +3942,20 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Kopiert alle Einstellungen von einem Raum zu einem anderen."
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 msgid "Created"
 msgstr "Erstellt"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "Erstellt"
@@ -4023,7 +4014,7 @@ msgstr "Ziel Passwort"
 msgid "DEL [nickname] channel"
 msgstr "DEL [Benutzer] Maske"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "Nickname Sprache"
@@ -4033,8 +4024,8 @@ msgstr "Nickname Sprache"
 msgid "DEL [nickname] mask"
 msgstr "DEL [Benutzer] Maske"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [Maske] {Nummer | Liste | id}"
 
@@ -4347,8 +4338,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "Die Beschreibung von %s wurde entfernt."
@@ -4496,12 +4487,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail Adresse für %s wurde auf %s geändert."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail Adresse  %s wurde entfernt."
@@ -4578,7 +4569,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4612,14 +4603,14 @@ msgstr ""
 "wiederhergestellt sobald jemand wieder in den Raum \n"
 "kommt."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -4811,7 +4802,7 @@ msgstr "Ende der Chatraum-Liste."
 msgid "End of configuration."
 msgstr "Ende der Konfiguration."
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 msgid "End of entry message list."
 msgstr "Ende der Begrüssungsnachricht-Liste."
 
@@ -4829,7 +4820,7 @@ msgstr "Ende der FORBID-Liste."
 msgid "End of list - %d channels shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Ende der Liste - %d/%d Treffer angezeigt."
@@ -4864,37 +4855,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Deutsch"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Begrüssungsnachricht %i für %s wurde entfernt."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Begrüssungsnachricht %s wurde im Raum %s nicht gefunden.."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, c-format
 msgid "Entry message added to %s"
 msgstr "Begrüssungsnachricht wurde %s hinzugefügt."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Keine Begrüssungsnachrichten für %s gesetzt."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, c-format
 msgid "Entry message list for %s:"
 msgstr "Begrüssungsnachrichten für %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Alle Begrüssungsnachrichten für %s wurden gelöscht."
@@ -4918,7 +4909,7 @@ msgid ""
 "characters."
 msgstr "Fehler! Der Vhost ist zu lang, er darf maximal %d Zeichen lang sein."
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -4944,12 +4935,12 @@ msgstr "Die Ausnahme für %s (#%d) wurde auf die  %d Position verschoben."
 msgid "Exception for %s has been updated to %d."
 msgstr "Ausnahme für %s ist zu %d aktualisiert worden."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 msgid "Expires"
 msgstr "Läuft ab"
 
@@ -4963,7 +4954,7 @@ msgstr "Ablaufzeit und Grund wurden für %s aktualisiert."
 msgid "Expiry for %s updated."
 msgstr "Ablaufzeit von %s geändert."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasy-Modus"
 
@@ -4982,11 +4973,16 @@ msgstr "Fantasy Modus ist jetzt ON im %s."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Entfernt Dein Gründer Status in einen Channel"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "%s ist bereits auf der Zertifikat-Liste."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "%s ist bereits in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5211,12 +5207,12 @@ msgstr "Ignore-Liste ist leer."
 msgid "Ignore list:"
 msgstr "Ignore Liste:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Voice-Schutz"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "E-mail-Adresse"
@@ -5302,17 +5298,17 @@ msgstr "Italics kicker : %s"
 msgid "Join a group"
 msgstr "Verknüpfe deinen Nicknamen"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Nachrichten-Modus"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Peace Option für %s ist jetzt ON."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Peace Option für %s ist jetzt ON."
@@ -5330,7 +5326,7 @@ msgstr "Key für Chatrauml %s ist %s."
 msgid "Kick a user from a channel"
 msgstr "Kickt einen Benutzer aus einem Chatraum."
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5372,8 +5368,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr "LIST [Channel | Liste | Nummer]"
 
@@ -5381,8 +5377,8 @@ msgstr "LIST [Channel | Liste | Nummer]"
 msgid "LIST [mask | list]"
 msgstr "LIST [Channel | [Liste]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "[Nickname]"
@@ -5391,7 +5387,7 @@ msgstr "[Nickname]"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [Text|Nummer]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Sprache wurde geändert zu Deutsch."
 
@@ -5404,7 +5400,7 @@ msgstr "Die letzte Memo an %s wurde widerrufen."
 msgid "Last quit message"
 msgstr "Letzte Quit-Nachricht:"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 msgid "Last seen"
 msgstr "Letztes Mal gesehen:"
 
@@ -5416,7 +5412,7 @@ msgstr "Letzte gesehene Hostmaske: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "Letztes Mal gesehen:"
@@ -5446,8 +5442,8 @@ msgstr "Level für %s in Chatrauml %s zu \"founder only\" geändert."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Der Level kann nur zwischen %d und einschliesslich %d liegen."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5468,17 +5464,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "Listet die geladenen Module auf"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Liste der Einträge die mit %s übereinstimmen:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste der Nicknamen in der Gruppe von %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Liste der Nicknamen in Deiner Gruppe:"
 
@@ -5530,7 +5526,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 msgid "Lists all nicknames in your group"
 msgstr "Liste der Nicknamen in Deiner Gruppe:"
 
@@ -6014,7 +6010,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Du kannst in diesem Netzwerk Deine eMail-Adresse nicht entfernen."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6049,15 +6045,15 @@ msgstr "    DEFCON        Ändert das  DefCon System"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Ändert den Topic des angegebenen Channels"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6071,8 +6067,8 @@ msgstr "Diese Hostmaske %s ist bereits auf der Access-Liste."
 msgid "Mask must be in the form user@host."
 msgstr "Eine vHost muss eine gültige HostMaske besitzen."
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "Diese Hostmaske %s ist bereits auf der Access-Liste."
@@ -6126,7 +6122,7 @@ msgstr ""
 "Memo-Limit von %s wurde auf 0 gesetzt, kein Memo-Empfang für ihn mehr "
 "möglich."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo wurde an %s versandt."
@@ -6136,12 +6132,12 @@ msgstr "Memo wurde an %s versandt."
 msgid "Memos for %s:"
 msgstr "        Mode lock: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "Nachricht"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Nachrichten-Modus"
 
@@ -6224,7 +6220,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "    Zeigt die aktuelle Zugriffsliste an."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6249,14 +6245,14 @@ msgstr "    AOP        Verwaltet die AOP-Liste von einen Channel"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS      Liste der autorisierten Adressen"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr ""
 "    ACCESS     Die Liste der priviligierten User\n"
 "               bearbeiten"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE        Die \"Services Ignore Liste\" bearbeiten"
@@ -6312,10 +6308,10 @@ msgstr "Module: %s Version: %s Autor: %s geladen: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6332,9 +6328,9 @@ msgstr "Badword Liste von %s:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "Nickname"
@@ -6400,12 +6396,12 @@ msgstr "Der Nickname %s wurde erfolgreich registriert."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Dein Nickname %s wurde auf %d Zeichen gekürzt."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nickname %s wird wieder verfallen."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nickname %s wird nicht mehr verfallen."
@@ -6420,7 +6416,7 @@ msgstr "Nickname %s hat keine Nachricht von Dir."
 msgid "Nick %s has been logged out."
 msgstr "Der Nickname %s wurde erfolgreich ausgeloggt."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Die Gruppierung des Nicks %s  mit %s wurde aufgehoben."
@@ -6430,7 +6426,7 @@ msgstr "Die Gruppierung des Nicks %s  mit %s wurde aufgehoben."
 msgid "Nick %s is currently suspended."
 msgstr "Der Nickname %s ist jetzt suspendiert."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6470,17 +6466,17 @@ msgstr "Der Channel %s ist bereits registriert!"
 msgid "Nickname %s may not be registered."
 msgstr "Der Channel %s kann nicht registriert werden."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Dein Nickname %s ist unter Deinem Host registriert worden: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Der Nickname %s wurde erfolgreich registriert."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6489,7 +6485,7 @@ msgstr "Auto-op"
 msgid "No bot"
 msgstr "Kein Bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "läuft nicht aus"
@@ -6523,8 +6519,8 @@ msgstr "Keine eingetragenen Emails für %s."
 msgid "No matching entries on %s %s list."
 msgstr "Keine passenden Einträge in der %s AOP-Liste."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr ""
@@ -6598,8 +6594,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Access-Liste von %s:"
@@ -6609,7 +6605,7 @@ msgstr "Access-Liste von %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s wurde nach %s eingeladen."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Usermodi von %s geändert."
@@ -6637,17 +6633,17 @@ msgstr "Keine"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -6773,12 +6769,12 @@ msgstr "Passwort von %s ist %s."
 msgid "Password incorrect."
 msgstr "Falsches Passwort."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Frieden"
 
@@ -6792,7 +6788,7 @@ msgstr "Peace Option für %s ist jetzt ON."
 msgid "Peace option for %s is now on."
 msgstr "Peace Option für %s ist jetzt ON."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -6828,17 +6824,17 @@ msgstr "Bitte warte noch %d Sekunden und versuche es dann erneut."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Bitte warte %d Sekunden bis Du den SEND Befehl wieder benutzen kannst."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Bitte warte %d Sekunden bis du den SEND Befehl wieder benutzen kannst."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -6889,7 +6885,7 @@ msgstr ""
 "    PRIVATE    Verhindert, dass der Nickname im Befehl\n"
 "               /msg %s LIST auftaucht"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr ""
@@ -6900,8 +6896,8 @@ msgstr ""
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privat"
 
@@ -6945,26 +6941,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Kill-Schutz"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Schutz des Nicknamens %s ist jetzt aktiviert (ON)."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Schutz des Nicknamens %s ohne Verzögerung aktiviert (ON)."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Schutz des Nicknamens %s ist jetzt aktiviert (ON)."
@@ -6981,7 +6977,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/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Voice-Schutz"
@@ -7027,11 +7023,11 @@ msgstr "    READ   Lesen einer oder mehrerer Memos"
 msgid "Real name"
 msgstr "  Echter Name: %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7064,14 +7060,14 @@ msgstr ""
 "    RELEASE     Hebt die Nickname-Sperre auf nach der \n"
 "                verwendung des RECOVER Befehls"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s ist eingeschaltet"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7079,8 +7075,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7156,7 +7152,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7264,7 +7260,7 @@ msgstr "    MODLOAD       Lädt ein Modul"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP     Remove a nick from a group"
@@ -7342,7 +7338,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
@@ -7352,7 +7348,7 @@ msgstr "    RELOAD        Die Konfigurationsdatei neu einlesen"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Eingeschränkter Zugriff auf den Channel"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Eingeschränkter Zugang"
@@ -7509,12 +7505,12 @@ msgstr "NOOP {SET|REVOKE} Server"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Passwort akzeptiert - Du bist jetzt angemeldet."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Passwort akzeptiert - Du bist jetzt angemeldet."
@@ -7537,7 +7533,7 @@ msgstr "    RESTART       Datenbanken speichern und Services neustarten"
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Sicher Founder"
@@ -7552,7 +7548,7 @@ msgstr "Secure Founder Option für %s ist jetzt ON."
 msgid "Secure founder option for %s is now on."
 msgstr "Secure Founder Option für %s ist jetzt ON."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Sicher Ops"
@@ -7577,12 +7573,12 @@ msgstr "Secure Option für %s ist jetzt ON."
 msgid "Secure option for %s is now on."
 msgstr "Secure Option für %s ist jetzt ON."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
@@ -7592,7 +7588,7 @@ msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
 msgid "Secureops enforced on %s."
 msgstr "Sicherheitsfunktion (SECURE) ist für %s jetzt aktiviert (ON)."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Sicherheits Modus"
 
@@ -7646,7 +7642,7 @@ msgstr ""
 "    RSEND  Sendet eine Memo an einen Nickname oder Channel\n"
 "           und  sendet Dir eine Empfangsbestätigung zurück"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -7918,12 +7914,12 @@ msgid "Services will now automatically give modes to users in %s."
 msgstr ""
 "Die Services werden %s jetzt automatisch Op-Status geben in den Channels."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Die Services werden jetzt %s mit messages antworten."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Die Services werden jetzt %s mit notices antworten."
@@ -8002,7 +7998,7 @@ msgstr "    DISPLAY      Ändert den \"Ursprung\" Deiner Gruppe"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       Stellt den Gründer des Channels ein"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8425,7 +8421,7 @@ msgstr ""
 "angegebenen Nicknamen automatisch Op-Status zu geben,\n"
 "wenn der Nick die Channels betritt."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8523,11 +8519,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Signierte kicks Option für %s ist jetzt ON."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Signierte kicks"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s hat zu viele Memos gespeichert und kann keine weiteren empfangen."
@@ -8542,12 +8538,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Die SET-Optionen sind derzeit deaktiviert."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Das Verändern von Bot-Einstellungen ist derzeit deaktiviert."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Die SET-Optionen sind derzeit deaktiviert."
 
@@ -8557,7 +8553,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/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Das Ändern der Channel-Access-Liste wurde zwischenzeitig deaktiviert."
 
@@ -8594,7 +8590,7 @@ msgstr "MEMO SET Befehl wurde kurzzeitig deaktiviert."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Das Entfernen von Nicknamen ist derzeit deaktiviert."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Das Gruppieren von Nicknamen ist derzeit deaktiviert."
 
@@ -8612,13 +8608,13 @@ msgstr "Die Access-Liste ist auf %d Einträge beschränkt."
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Du kannst nur %d Einträge auf der Access-Liste speichern."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8753,7 +8749,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr ""
@@ -8764,7 +8760,7 @@ msgstr ""
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8775,7 +8771,7 @@ msgstr ""
 "\n"
 "Zeigt alle Nicknamen die in Deiner Gruppe enthalten sind.\t"
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9020,7 +9016,7 @@ msgstr ""
 "Registrierung, die Du mit dem REGISTER Befehl \n"
 "gesetzt hast."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9199,21 +9195,21 @@ msgstr ""
 "/msg %s HELP SET XOP für Infos über den Wechsel vom xOP und\n"
 "vom Access System."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9221,13 +9217,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "Die IMMED Option ist in diesem Netzwerk nicht verfügbar."
 
@@ -9310,7 +9306,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9394,7 +9390,17 @@ msgstr ""
 "von einschränkungen der Services einzubinden - nützlich während \n"
 "versuchter Angriffe auf das Netzwerk."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, c-format
 msgid "The entry message list for %s is full."
 msgstr "Die Liste der Begrüßungsnachrichten für %s ist voll."
@@ -9403,15 +9409,6 @@ msgstr "Die Liste der Begrüßungsnachrichten für %s ist voll."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9552,7 +9549,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "Es gibt %d Benachrichtigungen für den Channel %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "Es befinden sich zu viele Nicks in der Gruppe von %s."
@@ -9650,7 +9647,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -9662,7 +9659,7 @@ msgstr ""
 "Dieser Befehl erlaubt es Usern, den vHost ihres aktuellen\n"
 "Nicknamens, zum vHost der gesamten Gruppe zu setzen."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9739,7 +9736,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -9812,7 +9809,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -9854,7 +9851,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
@@ -9879,7 +9876,7 @@ msgstr ""
 "Dieser Befehl lädt das benannte Module aus dem \n"
 "modules - Verzeichnis."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10007,14 +10004,14 @@ msgstr ""
 "    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
 "                 für Deinen Nicknamen"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr ""
 "    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
 "                 für Deinen Nicknamen"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL         Stellt Kill-Schutz an oder aus."
@@ -10059,7 +10056,7 @@ msgstr ""
 "dem INFO Befehl Informationen über Deinen Nicknamen \n"
 "abrufen, unabhängig vom Privat-Modus.)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10095,7 +10092,7 @@ msgstr ""
 "    SECURE       Aktiviert/Deaktiviert den Sicherheitsmodus\n"
 "                 für Deinen Nicknamen"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10128,7 +10125,7 @@ msgstr ""
 "Ausserdem ist es möglich, dass die Netz-Admins\n"
 "diese Option deaktiviert haben."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10211,7 +10208,7 @@ msgstr ""
 "Tippe /msg %s HELP Option für weitere Informationen\n"
 "zu einem bestimmten Befehl."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10229,8 +10226,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD     Entfernt ein Modul"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Kann Modul %s nicht entfernen"
@@ -10460,8 +10457,8 @@ msgstr "Der vHost für die Gruppe %s wurde gesetzt auf %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [Channel] [Liste | NEW]"
@@ -10618,12 +10615,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Du bist bereits Mitglied der Gruppe %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Du bist bereits angemeldet."
 
@@ -10649,6 +10646,11 @@ msgstr "Du hast keine Berechtigung in diesem Chatraum zu sein."
 msgid "You are not permitted to change your memo limit."
 msgstr "Du hast keine Berechtigung Dein Memo-Limit zu ändern."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Du bist nicht angmeldet."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10658,7 +10660,7 @@ msgstr "Du bist jetzt ein Super-Admin."
 msgid "You are now an IRC Operator."
 msgstr "Du bist jetzt ein IRC Operator."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
 "Du bist jetzt für deinen Nick angemeldet. Ändere jetzt dein Passwort mit \"/"
@@ -10727,8 +10729,8 @@ msgstr ""
 msgid "You can't %s yourself!"
 msgstr "Du kannst %s nicht auf Dich selbst anwenden!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr ""
@@ -10741,7 +10743,7 @@ msgstr ""
 "Ausloggen von %s nicht möglich, da es sich um einen Services Administrator "
 "handelt."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, c-format
 msgid "You cannot %s on this network."
 msgstr "Du kannst in diesem Netzwerk nicht %s ."
@@ -10756,7 +10758,7 @@ msgstr "Du kannst das Memo-Limit für %s nicht höher als %d setzen."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Du kannst Dein Memo-Limit nicht höher als %d setzen."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Du kannst in diesem Netzwerk Deine eMail-Adresse nicht entfernen."
 
@@ -10829,7 +10831,12 @@ msgstr ""
 "Du hast eine neue Nachricht von %s.\n"
 "Tippe %s%s READ %d um sie zu lesen."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Du wurdest zu %seingeladen."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Du wurdest zu %seingeladen."
@@ -10885,12 +10892,19 @@ msgstr "Es befinden sich zu viele Nicks in der Gruppe von %s."
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 msgid "You may not change the e-mail of other Services Operators."
 msgstr ""
 "Du kannst in diesem Netzwerk die eMail-Adresse  anderer \"Servive Operaotors"
 "\" nicht ändern."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr ""
+"Du kannst in diesem Netzwerk die eMail-Adresse  anderer \"Servive Operaotors"
+"\" nicht ändern."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -10925,7 +10939,7 @@ msgstr ""
 "Ausloggen von %s nicht möglich, da es sich um einen Services Administrator "
 "handelt."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -10961,7 +10975,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -10975,7 +10989,7 @@ msgstr ""
 "Bevor Du diesen Befehl benutzen kannst musst Du dem Chatraum erst einen Bot "
 "zuordnen."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -10985,11 +10999,6 @@ msgstr ""
 "NickServ kann Dir dann Dein Passwort per Mail senden, falls Du es\n"
 "vergessen solltest."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s ist keine gültige E-Mail Adresse."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "Du musst dich anmelden um diesen Befehl zu nutzen."
@@ -11054,16 +11063,16 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Dein Account %s wurde erfolgreich angelegt."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 msgid "Your account is already confirmed."
 msgstr "Dein Account ist bereits bestätigt."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Wenn Dein Account nicht bestätigt wird, wird er in %s auslaufen."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Deine eMail-Adresse wurde auf %s geändert."
@@ -11073,7 +11082,7 @@ msgstr "Deine eMail-Adresse wurde auf %s geändert."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Deine eMail-Adresse %s wurde bestätigt.#"
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11129,11 +11138,11 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Du wurdest ausgeloggt."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 msgid "Your nick is already registered."
 msgstr "Dein Nickname ist bereits registriert."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 #, fuzzy
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr ""
@@ -11144,7 +11153,7 @@ msgstr ""
 msgid "Your nick isn't registered."
 msgstr "Dein Nick ist nicht registriert."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Dein Nickname wurde geändert in %s"
@@ -11153,12 +11162,12 @@ msgstr "Dein Nickname wurde geändert in %s"
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Dein Passcode wurde noch einmal an %s geschickt."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Dein Passwort ist %s - behalte es für spätere Benutzung."
@@ -11168,7 +11177,7 @@ msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 "Dein Passwort ist zu lang, bitte versuche es mit einem kürzeren Passwort."
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Deine Anfrage für die Zurücksetzung des Passworts ist abgelaufen."
 
@@ -11282,7 +11291,7 @@ msgstr "[<key>|<#X-Y>"
 msgid "[nick | channel]"
 msgstr "[Nickname | Channel]"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "Nickname"
@@ -11291,8 +11300,8 @@ msgstr "Nickname"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr "[Nickname]"
 
@@ -11312,7 +11321,7 @@ msgstr "[+Zeit] {Channel} [Grund]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11475,6 +11484,6 @@ msgstr "Channel Nick"
 msgid "{nick | channel}"
 msgstr "{Nickname | Channel}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 msgid "{nick | channel} memo-text"
 msgstr "{Nickname | Channel} Memo-text"
diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po
index 057efc263..dc6ceefd8 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 20:34-0400\n"
 "Last-Translator: VisioN <vision@myirc.us>\n"
 "Language-Team: Greek\n"
@@ -57,7 +57,7 @@ msgstr "#%s# προσθέθηκε στην λίστα των κακών λέξε
 msgid "%s added to %s's access list."
 msgstr "#%s# έγινε προσθήκη στην λίστα πρόσβασής σου."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "#%s# έγινε προσθήκη στην λίστα πρόσβασής σου."
@@ -77,11 +77,6 @@ msgstr "#%s# προσθέθηκε στην λίστα AKILL."
 msgid "%s added to the AKILL list."
 msgstr "#%s# προσθέθηκε στην λίστα AKILL."
 
-#: modules/commands/ns_cert.cpp:180
-#, c-format
-msgid "%s added to your certificate list."
-msgstr "#%s# έγινε προσθήκη στην λίστα πρόσβασής σου."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -113,7 +108,7 @@ msgstr ""
 "εντολές γράψτε #/msg %s HELP #command##. \n"
 "    "
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -130,7 +125,7 @@ msgstr ""
 "Για περισσότερες πληροφορίες σε μια συγκεκριμένη εντολή,γράψτε\n"
 "#/msg %s HELP ^_command^_#."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -223,7 +218,7 @@ msgstr "#%s# διαγράφτηκε από την λίστα των κακών 
 msgid "%s deleted from %s's access list."
 msgstr "#%s# διαγράφηκε από το access list του %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "#%s# διαγράφτηκε από την λίστα πρόσβασής σου."
@@ -243,11 +238,6 @@ msgstr "Ο/η #%s# διαγράφηκε επιτυχώς από την AOP λί
 msgid "%s deleted from the AKILL list."
 msgstr "#%s# διαγράφηκε από την λίστα AKILL."
 
-#: modules/commands/ns_cert.cpp:209
-#, c-format
-msgid "%s deleted from your certificate list."
-msgstr "#%s# διαγράφτηκε από την λίστα πρόσβασής σου."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -332,7 +322,7 @@ msgstr "#%s#  είναι ήδη στη λίστα αγνόησης σου"
 msgid "%s is already suspended."
 msgstr "Είστε ήδη στο κανάλι #%s#! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "#%s# δεν είναι σωστό bot ή κατοχυρωμένο κανάλι."
@@ -399,7 +389,7 @@ msgstr "Ο/η #%s# προσθέθηκε επιτυχώς στην autokick λί
 msgid "%s not found on %s %s list."
 msgstr "Ο/η #%s# δεν βρέθηκε η θέση στην AOP λίστα του %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Ο/η #%s# δεν βρέθηκε στην access list του %s"
@@ -419,7 +409,7 @@ msgstr "#%s# δεν βρέθηκε στη λίστα των κακών λέξε
 msgid "%s not found on %s's access list."
 msgstr "Ο/η #%s# δεν βρέθηκε στην access list του %s"
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "#%s# δεν βρέθηκε στη λίστα πρόσβασής σου."
@@ -588,6 +578,12 @@ msgstr ""
 msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr "#[auto-memo]# Το memo που στείλατε στο %s έχει διαβαστεί."
 
+#
+#: modules/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "^_στόχος^_ ^_κωδικό^_"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -597,11 +593,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET #nickname# AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "DROP #channel#"
 
@@ -629,8 +625,8 @@ msgstr "BAN ##channel# #nick# [#reason#]"
 msgid "channel modes"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "UNBAN #κανάλι# [#nick#]"
 
@@ -669,7 +665,7 @@ msgstr "ACT #κανάλι# #κείμενο#"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "ACT #κανάλι# #κείμενο#"
@@ -687,9 +683,9 @@ msgstr ""
 msgid "channel APPEND topic"
 msgstr "TOPIC #κανάλι# [#topic#]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr ""
 
@@ -703,12 +699,12 @@ msgstr "TOPIC #κανάλι# [#topic#]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP #channel#"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "UNBAN #κανάλι# [#nick#]"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr ""
 
@@ -724,7 +720,7 @@ msgstr ""
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr ""
 
@@ -732,8 +728,8 @@ msgstr ""
 msgid "channel LIST [mask | entry-num | list]"
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr ""
 
@@ -777,11 +773,11 @@ msgid "channel VIEW [mask | list]"
 msgstr ""
 
 #
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "Αλλάζει την περιγραφή του καναλιού"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "UNBAN #κανάλι# [#nick#]"
 
@@ -809,8 +805,8 @@ msgstr "BAN ##channel# #nick# [#reason#]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "SET #channel# XOP {ON | OFF}"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET #channel# XOP {ON | OFF}"
@@ -850,13 +846,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET #channel# SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "SET #channel# XOP {ON | OFF}"
 
@@ -864,7 +860,7 @@ msgstr "SET #channel# XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 msgid "language"
 msgstr ""
 
@@ -876,8 +872,8 @@ msgstr "STAFF #memo-text#"
 msgid "message"
 msgstr ""
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -889,10 +885,10 @@ msgstr ""
 msgid "new-password"
 msgstr ""
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr ""
 
@@ -918,12 +914,12 @@ msgstr ""
 msgid "nick [reason]"
 msgstr "BAN ##channel# #nick# [#reason#]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "CHECK #nickname#"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 msgid "nickname address"
 msgstr ""
 
@@ -932,7 +928,7 @@ msgstr ""
 msgid "nickname email"
 msgstr "DEL #<nick>#."
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 msgid "nickname language"
 msgstr ""
 
@@ -969,14 +965,14 @@ msgstr "SUSPEND nickname reason"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "SASET #nickname# AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET #nickname# KILL {ON | QUICK | IMMED | OFF}"
 
@@ -1039,11 +1035,6 @@ msgstr "LIST #pattern# [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE #servername# [#reason#]"
 
-#
-#: modules/commands/ns_group.cpp:78
-msgid "target password"
-msgstr "^_στόχος^_ ^_κωδικό^_"
-
 #: modules/commands/os_mode.cpp:139
 msgid "user modes"
 msgstr ""
@@ -1052,7 +1043,7 @@ msgstr ""
 msgid "user [reason]"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, c-format
 msgid ""
 " \n"
@@ -1209,7 +1200,7 @@ msgstr ""
 "Μόνο για τους #Services operators#.\t\n"
 "    "
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1345,7 +1336,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -1651,7 +1642,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1708,7 +1699,7 @@ msgstr "%d bots διαθέσιμα."
 msgid "%d modules loaded."
 msgstr "%d Modules έχουν φορτωθεί."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d ψευδώνυμα μέσα στο group."
@@ -1812,9 +1803,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "        Κεφαλαία γράμματα με kick : %s (ελάχιστο %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "Η λίστα του %s access list είναι άδεια."
@@ -1846,8 +1837,8 @@ msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr ""
 "%s δεν μπορεί να είναι successor στο κανάλι %s γιατί είναι founder σε αυτό."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Οι εντολές του %s είναι::"
@@ -2119,7 +2110,7 @@ msgid "%s's auto join list:"
 msgstr "Η λίστα αυτόματης εισόδου σας είναι γεμάτη."
 
 #
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Η access λίστα σας είναι άδεια."
@@ -2225,7 +2216,7 @@ msgstr "Ο %s είναι για την ώρα off."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2293,18 +2284,18 @@ msgstr ""
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+#expiry#] {##channel#} [#reason#]"
 
-#
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "Ρυθμίζει τον κωδικό του ψευδονύμου."
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "DEL #<nick>#."
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "Ρυθμίζει τον κωδικό του ψευδονύμου."
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr ""
 
@@ -2383,7 +2374,7 @@ msgstr "Ο βαθμός access για το κανάλι %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Ο βαθμός Access για το #%s# σβήστηκε στο αρχικό."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "Λίστα πρόσβασης για #%s#:"
@@ -2521,7 +2512,7 @@ msgstr "Όλα τα memos από το κανάλι %s έχουν διαγραφ
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2554,12 +2545,12 @@ msgstr "Όλες οι ρυθμίσεις από το #%s# έχουν μεταφ
 msgid "All user modes on %s have been synced."
 msgstr "Όλα τα memos από το κανάλι %s έχουν διαγραφεί."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, c-format
 msgid "All vhost's in the group %s have been set to %s."
 msgstr "Όλες οι vhosts στο #%s# μεταφέρθηκαν στο #%s#"
 
-#: modules/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, c-format
 msgid "All vhost's in the group %s have been set to %s@%s."
 msgstr "Όλες οι vhosts στο group #%s# έγιναν #%s#@#%s#"
@@ -3030,7 +3021,7 @@ msgstr ""
 "χάνονται αν η Anope γίνει RESTART/SHUT DOWN/RELOADExample:\n"
 "     #CONFIG MODIFY nickserv forcemail no# \n"
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3043,7 +3034,7 @@ msgstr ""
 "με το χρήστη. Με τη παράμετρο #MSG#, τα Services θα χρησιμοποιούν μηνύματα,\n"
 "αλλιώς θα χρησιμοποιούν notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3219,11 +3210,11 @@ msgid "Associate oper info with a nick or channel"
 msgstr "Ζητάτε από το bot να έρθει στο κανάλι σας"
 
 #
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 msgid "Associates the given E-mail address with the nickname."
 msgstr "Συσχετίζει μία διεύθυνση e-mail με το ψευδώνυμό σας"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
 "This address will be displayed whenever someone requests\n"
@@ -3236,7 +3227,7 @@ msgstr ""
 "πληροφορίες\n"
 "στο κανάλι με την εντολή #INFO#."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3550,8 +3541,8 @@ msgstr "Το Bot δεν θα κάνει kick #για επαναλήψεις# π
 msgid "Bot won't kick for repeats anymore."
 msgstr "Το Bot δεν θα κάνει kick #για επαναλήψεις# πλέον."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3595,7 +3586,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Το Bot #θα κάνει kick τους ops# του καναλιού %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Δεν μπορεί να σταλεί στη διεύθυνση το μήνυμα για την ώρα; παρακαλώ "
@@ -3679,7 +3670,7 @@ msgstr ""
 "    \n"
 "Μόνο για τους #Services Operators#."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Λίστα πρόσβασης για #%s#:"
@@ -3694,7 +3685,7 @@ msgid "Change channel modes"
 msgstr "Ο/η #%s# άλλαξε τα usermodes σας."
 
 #
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 msgid "Change the communication method of Services"
 msgstr "Αλλάζει την μέθοδο επικοινωνίας με τις υπηρεσίες"
 
@@ -3742,7 +3733,7 @@ msgstr ""
 "κατοχυρωμένο."
 
 #
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
@@ -3758,7 +3749,7 @@ msgstr ""
 "υποστηριζόμενων γλωσσών:"
 
 #
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
@@ -3808,7 +3799,7 @@ msgstr ""
 "αν δηλ έχει (%d), το κανάλι θα σβηστεί,σαν να μην είχε οριστεί\n"
 "successor.  Το νέο ψευδώνυμο θα πρέπει να είναι κατοχυρωμένο."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP #channel#"
@@ -3893,7 +3884,7 @@ msgstr "Το κανάλι %s #δεν θα# λήξει."
 msgid "Channel %s %s list has been cleared."
 msgstr "Η λίστα του %s %s καναλιού έχει σβηστεί."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Η λίστα access του %s καναλιού έχει σβηστεί."
@@ -3931,8 +3922,8 @@ msgstr ""
 "Κανάλια στα οποία ο/η #%s# έχει access:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "Ο/η #%s# δεν βρέθηκε στην access list του %s"
@@ -4129,7 +4120,7 @@ msgstr "Κάνει confirm με ένα κωδικό"
 msgid "Control modes and mode locks on a channel"
 msgstr "Καθαρίζει τα modes από το κανάλι"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4153,21 +4144,21 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Αντιγράφει όλες τις ρυθμίσεις από ένα κανάλι σε ένα άλλο."
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "    Δημιουργήθηκε : %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "    Δημιουργήθηκε : %s"
@@ -4228,7 +4219,7 @@ msgid "DEL [nickname] channel"
 msgstr "RSEND {#nick# | #channel#} #memo-text#"
 
 #
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "Ρυθμίζει τον κωδικό του ψευδονύμου."
@@ -4238,8 +4229,8 @@ msgstr "Ρυθμίζει τον κωδικό του ψευδονύμου."
 msgid "DEL [nickname] mask"
 msgstr "DEL #<nick>#."
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr ""
 
@@ -4561,8 +4552,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "Περιγραφή του %s άλλαξε σε #%s#."
@@ -4726,12 +4717,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Η διεύθυνση email για το #%s# άλλαξε σε #%s#."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Η διεύθυνση email για το #%s# διαγράφηκε."
@@ -4821,7 +4812,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4856,14 +4847,14 @@ msgstr ""
 "θα υπενθυμίζεται από τον %s μετά τον τελευταίο χρήστη που θα φύγει από\n"
 "το κανάλι, και θα αποθηκεύεται για την επόμενη φορά."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5066,7 +5057,7 @@ msgstr "Τέλος λίστας καναλιού."
 msgid "End of configuration."
 msgstr "Τέλος ρυθμίσεων"
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 msgid "End of entry message list."
 msgstr "Τελος της λίστας προσβασης."
 
@@ -5084,7 +5075,7 @@ msgstr "Τέλος λίστας χρηστών."
 msgid "End of list - %d channels shown."
 msgstr "Τέλος της λίστας - %d/%d βρέθηκαν και εμφανίστηκαν."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Τέλος της λίστας - %d/%d βρέθηκαν και εμφανίστηκαν."
@@ -5119,37 +5110,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Ελληνικά"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Το μήνυμα χαιρετισμού για τον #%s# αφερέθηκε."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Η Fantasy επιλογή είναι τώρα #ON# στο κανάλι %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, c-format
 msgid "Entry message added to %s"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Access list for #%s# is empty."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, c-format
 msgid "Entry message list for %s:"
 msgstr "Λίστα πρόσβασης για #%s#:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Όλα τα memos από το κανάλι %s έχουν διαγραφεί."
@@ -5174,7 +5165,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5212,12 +5203,12 @@ msgstr "Exception για #%s# (#%d) μετακινήθηκε στη θέση #%d
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception για #%s# άλλαξε σε %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "Λίγει στις: %s"
@@ -5232,7 +5223,7 @@ msgstr "Exception για #%s# άλλαξε σε %d."
 msgid "Expiry for %s updated."
 msgstr "Το χρονικό όριο του/ης #%s# άλλαξε"
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Φαντασία"
 
@@ -5252,11 +5243,16 @@ msgstr "Η Fantasy επιλογή είναι τώρα #ON# στο κανάλι %
 msgid "Find a user's status on a channel"
 msgstr "Αφαιρεί το owner status σε ένα κανάλι."
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "Η μάσκα #%s# είναι ήδη μέσα στην λίστα πρόσβασης."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "Είστε ήδη στο κανάλι #%s#! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5497,12 +5493,12 @@ msgstr "Η λίστα ignore των υπηρεσιών είναι άδεια."
 msgid "Ignore list:"
 msgstr "Bot λίστα:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Προστασία στους Voices"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "  Διεύθυνση E-mail: %s"
@@ -5591,17 +5587,17 @@ msgstr "       Πλάγια γράμματα kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Μπένετε σε ομάδα ψευδώνυμου"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Επιλογή μηνύματος"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Η Peace επιλογή για το %s  #ΑΠΕΝΕΡΓΟΠΟΙΉΘΗΚΕ#."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Η Peace επιλογή για το %s  #ΕΝΕΡΓΟΠΟΙΉΘΗΚΕ#."
@@ -5620,7 +5616,7 @@ msgstr "Key for channel #%s# is #%s#."
 msgid "Kick a user from a channel"
 msgstr "Απομακρύνει το χρήστη από το κανάλι"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5664,8 +5660,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr ""
 
@@ -5673,8 +5669,8 @@ msgstr ""
 msgid "LIST [mask | list]"
 msgstr ""
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK #nickname#"
@@ -5683,7 +5679,7 @@ msgstr "CHECK #nickname#"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [#περιεχόμενο#|#νούμερο#]#"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Η γλώσσα άλλαξε σε #Ελληνικά#."
 
@@ -5697,7 +5693,7 @@ msgstr "Το τελευταίο μήνυμα που πήγαινε για τον
 msgid "Last quit message"
 msgstr "Τελευταίο αποχαιρετιστήριο μήνυμα: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "   Τελευταία φορά που ήταν στο δίκτυο: %s"
@@ -5711,7 +5707,7 @@ msgstr "Τελευταία διεύθυνση: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "   Τελευταία φορά που ήταν στο δίκτυο: %s"
@@ -5741,8 +5737,8 @@ msgstr "Το Level για %s στο κανάλι %s άλλαξε σε founder on
 msgid "Level must be between %d and %d inclusive."
 msgstr "Ο βαθμός πρέπει να είναι μεταξύ %d και %d."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5766,17 +5762,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "Εμφανίζει όλα τα φορτωμένα Modules."
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Η λίστα με τα ψευδώνυμα στην ομάδα του #%s#:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Η λίστα με τα ψευδώνυμα στην ομάδα:"
 
@@ -5834,7 +5830,7 @@ msgid ""
 msgstr ""
 
 #
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 msgid "Lists all nicknames in your group"
 msgstr "Η λίστα με τα ψευδώνυμα στην ομάδα:"
 
@@ -6163,8 +6159,8 @@ msgstr ""
 "Syntax: #MODE #channel# LOCK {ADD|DEL|LIST} [#what#]#\n"
 "        #MODE #channel# SET #modes##\n"
 " \n"
-"Κυρίως ελέγχει τα mode locks και mode access (διαφορετικό του channel access)"
-"σε ένα κανάλι.\n"
+"Κυρίως ελέγχει τα mode locks και mode access (διαφορετικό του channel "
+"access)σε ένα κανάλι.\n"
 "Η εντολή #MODE LOCK# επιτρέπει να προσθέσετε, αφαιρέσετε και να δελιτε τα "
 "mode locksσε ένα κανάλι\n"
 "Αν ένα mode είναι locked on ή off, τα services δε θα επιτρέψουν να αλλάξει.\n"
@@ -6343,7 +6339,7 @@ msgstr ""
 "Δεν μπορείς να απενεργοποιήσεις την διεύθυνση του e-mail σε αυτό το δίκτυο."
 
 #
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 msgid "Manage the channel's entry messages"
 msgstr "Κάνει το κανάλι permanent."
 
@@ -6379,15 +6375,15 @@ msgstr "Διαχειρίζεται το σύστημα DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "Αλλάζει το topic σε ένα κανάλι."
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6400,8 +6396,8 @@ msgstr "Η μάσκα #%s# είναι ήδη μέσα στην λίστα πρό
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "Η μάσκα #%s# είναι ήδη μέσα στην λίστα πρόσβασης."
@@ -6452,7 +6448,7 @@ msgstr "Το όριο μηνυμάτων για τον %s άλλαξε σε #%d#
 msgid "Memo limit for %s set to 0."
 msgstr "Το όριο μηνυμάτων για τον %s άλλαξε σε #0#."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Το μήνυμα στάλθηκε στον #%s#."
@@ -6462,12 +6458,12 @@ msgstr "Το μήνυμα στάλθηκε στον #%s#."
 msgid "Memos for %s:"
 msgstr "      Επιλογές κλειδώματος: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "Επιλογή μηνύματος"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Επιλογή μηνύματος"
 
@@ -6550,7 +6546,7 @@ msgstr ""
 "        Εμφανίζει την τρέχουσα λίστα πρόσβασης.\n"
 "    "
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6577,12 +6573,12 @@ msgid "Modify the list of authorized addresses"
 msgstr "Αλλάζει τη λίστα των εξουσιοδοτημένων διευθύνσεων"
 
 #
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 msgid "Modify the list of privileged users"
 msgstr "Αλλάζει τη λίστα των εξουσιοδοτημένων χρηστών"
 
 #
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "Τροποποιεί την Services Ignore List"
@@ -6636,10 +6632,10 @@ msgstr "Module: #%s# Έκδωση: #%s# Συγγραφέας: #%s# φορτώθ
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: #%s# [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6656,9 +6652,9 @@ msgstr "Λίστα πρόσβασης για #%s#:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 msgid "Nick"
 msgstr ""
 
@@ -6722,12 +6718,12 @@ msgstr "Το Nickname %s κατωχυρώθηκε."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Το Nick #%s# περικόπηκε σε %d χαρακτήρες."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Το Nick %s #θα# λήξει."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Το Nick %s #δεν θα# λήξει."
@@ -6742,7 +6738,7 @@ msgstr "Το Nick %s δεν έχει memo από εσάς."
 msgid "Nick %s has been logged out."
 msgstr "Το ψευδώνυμό σου %s δεν κατέχεται για την ώρα."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Το Nick %s έγινε ungroup από το %s."
@@ -6752,7 +6748,7 @@ msgstr "Το Nick %s έγινε ungroup από το %s."
 msgid "Nick %s is currently suspended."
 msgstr "Το Nick %s έγινε suspended."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "Tο nick %s δεν είναι στο group σας."
@@ -6792,17 +6788,17 @@ msgstr "Το κανάλι #%s# είναι ήδη κατοχυρωμένο!"
 msgid "Nickname %s may not be registered."
 msgstr "Το κανάλι #%s# δεν μπορεί να κατοχυρωθεί."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Αυτό το ψευδώνυμο #%s# κατοχυρώθηκε υπό την διεύθυνσή σου: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, c-format
 msgid "Nickname %s registered."
 msgstr "Το κανάλι #%s# δεν μπορεί να κατοχυρωθεί."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6812,7 +6808,7 @@ msgid "No bot"
 msgstr "Κανένα bot"
 
 #
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 msgid "No expire"
 msgstr "δεν λήγει ποτέ"
 
@@ -6845,8 +6841,8 @@ msgstr "Δεν υπάρχει κανένα email για το #%s#."
 msgid "No matching entries on %s %s list."
 msgstr "Δεν βρέθηκαν θέσεις στην AOP λίστα του %s %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Δεν βρέθηκαν θέσεις στου %s στην access list."
@@ -6917,8 +6913,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Λίστα πρόσβασης για #%s#:"
@@ -6928,7 +6924,7 @@ msgstr "Λίστα πρόσβασης για #%s#:"
 msgid "No such info \"%s\" on %s."
 msgstr "Ο/η #%s# προσκαλέσθηκε στο κανλάλι #%s#."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Τα usermodes του #%s# άλλαξαν."
@@ -6956,17 +6952,17 @@ msgstr "Κανένα"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7092,12 +7088,12 @@ msgstr "Ο κωδικός για τον %s είναι #%s#."
 msgid "Password incorrect."
 msgstr "Λάθος κωδικός."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Αλλαγή κωδικού για το ψευδόνυμο #%s# στάλθηκε."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Ειρηνικό"
 
@@ -7111,7 +7107,7 @@ msgstr "Η Peace επιλογή για το %s  #ΑΠΕΝΕΡΓΟΠΟΙΉΘΗΚ
 msgid "Peace option for %s is now on."
 msgstr "Η Peace επιλογή για το %s  #ΕΝΕΡΓΟΠΟΙΉΘΗΚΕ#."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7148,20 +7144,20 @@ msgid "Please wait %d seconds before requesting a new vHost."
 msgstr ""
 "Παρακαλώ περίμενε %d δευτερόλεπτα πριν χρησιμοποιήσεις την εντολή SEND ξανά."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
 "Παρακαλώ περίμενε %d δευτερόλεπτα πριν χρησιμοποιήσεις την εντολή SEND ξανά."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr ""
 "Παρακαλώ περίμενε %d δευτερόλεπτα και μετά ξαναχρησιμοποίησε την εντολή "
 "ομαδοποίησης."
 
-#: modules/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -7211,7 +7207,7 @@ msgid "Prevent the nickname from appearing in the LIST command"
 msgstr "Κάντε ένα nick να μή φαίνεται στην εντολή #/msg %s LIST#"
 
 #
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 msgid "Prevent the nickname from expiring"
 msgstr "Κάντε ένα nickname να μη λήγει ποτέ."
 
@@ -7219,8 +7215,8 @@ msgstr "Κάντε ένα nickname να μη λήγει ποτέ."
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Μυστικότητα"
 
@@ -7264,27 +7260,27 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Προστασία"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, c-format
 msgid "Protection is now off for %s."
 msgstr "Η προστασία #απενεργοποιήθηκε# για το #%s#."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, c-format
 msgid "Protection is now on for %s, with a reduced delay."
 msgstr ""
 "Η προστασία #ενεργοποιήθηκε# για το #%s#. , με μια μειωμένη καθυστέρηση"
 
-#: modules/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Η προστασία #ενεργοποιήθηκε# για το #%s#. ,με καθόλου καθυστέρηση"
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, c-format
 msgid "Protection is now on for %s."
 msgstr "Η προστασία #ενεργοποιήθηκε# για το #%s#."
@@ -7301,7 +7297,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Προστασία στους Voices"
@@ -7346,11 +7342,11 @@ msgstr "Διαβάζει ένα ή πολλά μηνύματα"
 msgid "Real name"
 msgstr "  Πραγματικό όνομα : %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7380,14 +7376,14 @@ msgstr "Επανακαθορίζει το νόημα των επιπέδων π
 msgid "Regains control of your nick"
 msgstr "Ανάκτηση της κατακράτησης του ψευδωνύμου,μετά από RECOVER"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s έχει απενεργοποιηθεί."
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7395,8 +7391,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7470,7 +7466,7 @@ msgstr ""
 "να έχετε πρώτα κατωχυρωμένο ψευδόνυμο. Αν δεν έχετε,\n"
 "#/msg %s HELP# για πληροφορίες."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7569,7 +7565,7 @@ msgid "Reload services' configuration file"
 msgstr "Ξαναφορτώνει το services' configuration αρχείο"
 
 #
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 msgid "Remove a nick from a group"
 msgstr "Αφαιρεί ένα nick από ένα group."
 
@@ -7648,7 +7644,7 @@ msgid ""
 msgstr ""
 
 #
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "Ξαναφορτώνει το services' configuration αρχείο"
@@ -7658,7 +7654,7 @@ msgstr "Ξαναφορτώνει το services' configuration αρχείο"
 msgid "Restrict access to the channel"
 msgstr "Απαγόρευση εισόδου στο κανάλι αν δεν έχεις access εκεί"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Μόνο όσοι έχουν Access"
@@ -7815,13 +7811,13 @@ msgid "SET server.name option value"
 msgstr ""
 
 #
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Ο κωδικός έγινε δεκτός - τώρα είσαι αναγνωρισμένος."
 
 #
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Ο κωδικός έγινε δεκτός - τώρα είσαι αναγνωρισμένος."
@@ -7844,7 +7840,7 @@ msgstr "Σώζει τις βάσεις δεδομένων και επανεκκ
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Ασφάλεια στον Καναλάρχη"
@@ -7859,7 +7855,7 @@ msgstr "H Secure founder επιλογή για το %s #ΑΠΕΝΕΡΓΟΠΟΙΗ
 msgid "Secure founder option for %s is now on."
 msgstr "H Secure founder επιλογή για το %s #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ#."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Μόνο αυτοί που έχουν access θα παίρνουν op από opers"
@@ -7884,12 +7880,12 @@ msgstr "H Secure option επιλογή για το %s #ΑΠΕΝΕΡΓΟΠΟΙΗ
 msgid "Secure option for %s is now on."
 msgstr "H Secure option επιλογή για το %s #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ#."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, c-format
 msgid "Secure option is now off for %s."
 msgstr "Η επιλογή Secure option #ΑΠΕΝΕΡΓΟΠΟΙΗΘΗΚΕ# για τον #%s#."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, c-format
 msgid "Secure option is now on for %s."
 msgstr "Η επιλογή Secure option #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ# για τον #%s#."
@@ -7899,7 +7895,7 @@ msgstr "Η επιλογή Secure option #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ# για τ
 msgid "Secureops enforced on %s."
 msgstr "Η επιλογή Secure option #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ# για τον #%s#."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Ασφάλεια"
 
@@ -7947,7 +7943,7 @@ msgstr "Ασφάλεια στον Καναλάρχη"
 msgid "Sends a memo and requests a read receipt"
 msgstr "Στέλνει ένα memo και ζητά απόδειξη ανάγνωσης."
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8204,12 +8200,12 @@ msgstr "Τα services δεν θα δίνουν πια autoop στον %s στα
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Τα services θα δίνουν autoop στον %s στα κανάλια."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Τα services δεν θα απαντούν πια στον #%s# με #μυνήματα#."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Τα services θα απαντούν πια στον #%s# με #notices#."
@@ -8283,7 +8279,7 @@ msgid "Set the founder of a channel"
 msgstr "Αλλάζει τον founder του καναλιού"
 
 #
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 msgid "Set the language Services will use when messaging you"
 msgstr ""
 "Αλλάζει τη γλώσσα που χρησιμοποιούν οι\n"
@@ -8690,7 +8686,7 @@ msgstr ""
 "Με επιλογή #ON# ο ChanServ θα δίνει Op στον χρήστη \n"
 "αυτόματα όταν μπαίνει στα κανάλια."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
@@ -8787,11 +8783,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Η επιλογή Signed kick για το %s #ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ#."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Δηλωμένα kicks"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s έχεις πολλά μηνύματα και δεν μπορείς να λάβεις άλλα."
@@ -8805,12 +8801,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Συγνώμη, η υπηρεσία bot είναι απενεργοποιημένη."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Συγνώμη, η υπηρεσία για το bot είναι απενεργοποιημένη."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Συγνώμη, η εντολή setting είναι απενεργοποιημένη."
 
@@ -8822,7 +8818,7 @@ msgstr ""
 "Συγνώμη, η υπηρεσία για την εντολή AOP του καναλιού %s είναι εκτός "
 "λειτουργίας."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Συγνώμη, η υπηρεσία για την εντολή access είναι εκτός λειτουργίας."
 
@@ -8859,7 +8855,7 @@ msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr ""
 "Συγνώμη, η υπηρεσία για να σβήνει τα  ψευδώνυμα είναι απενεργοποιημένη."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr ""
 "Συγνώμη, η ομαδοποίηση του ψευδώνυμού σου είναι για την ώρα απενεργοποιημένη."
@@ -8878,13 +8874,13 @@ msgstr "Συγνώμη, μπορείς μόνο να έχεις %d access στο
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Συγνώμη, μπορείς μόνο να έχεις %d πρόσβαση σε κατάταξη του ψευδώνυμου."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -9022,7 +9018,7 @@ msgid ""
 msgstr ""
 
 #
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "Συντονίζει την ίδια vhost για όλα τα nicks σε ένα group."
 
@@ -9030,7 +9026,7 @@ msgstr "Συντονίζει την ίδια vhost για όλα τα nicks σε
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -9041,7 +9037,7 @@ msgstr ""
 "\n"
 "Εμφανίζει όλα τα ψευδώνυμα που ανήκουν στην ίδια ομάδα."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9278,7 +9274,7 @@ msgstr ""
 "ο ίδιος με αυτόν που έδωσες για να κατοχυρώσης το ψευδώνυμο,\n"
 "δηλ με την #REGISTER# εντολή."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9465,21 +9461,21 @@ msgstr ""
 "Η εντολή #BADWORDS CLEAR# διαγράφει όλες τις καταχωρήσεις της λίστας\n"
 "των απαγορευμένων λέξεων."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9487,13 +9483,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "Η #IMMED# επιλογή δεν είναι διαθέσιμη σε αυτό το δίκτυο."
 
@@ -9578,7 +9574,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9660,7 +9656,17 @@ msgstr ""
 "κάποιες προκαθωρισμένες ενέργειες των services σε περίπτωση\n"
 "επίθεσης στο δίκτυο."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, c-format
 msgid "The entry message list for %s is full."
 msgstr "Το μήνυμα χαιρετισμού για τον #%s# αφερέθηκε."
@@ -9669,15 +9675,6 @@ msgstr "Το μήνυμα χαιρετισμού για τον #%s# αφερέθ
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9810,7 +9807,7 @@ msgid "There are no forbids of type %s."
 msgstr "Υπάρχουν #%d# memos στο κανάλι %s."
 
 #
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "Διαγράφει τη vhost από όλα τα nicks σε ένα group"
@@ -9907,7 +9904,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 msgid ""
 "This command allows users to set the vhost of their\n"
 "CURRENT nick to be the vhost for all nicks in the same\n"
@@ -9916,7 +9913,7 @@ msgstr ""
 "Αυτή η εντολή επιτρέπει στους χρήστες να ορίσουν τη vhost\n"
 "του nick που χρησιμοποιούν, ώς vhost για όλα τα nicks στο group τους."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9988,7 +9985,7 @@ msgstr ""
 "Syntax: #MODLOAD# #FileName#\n"
 "Αυτή η εντολή φορτώνει ένα module από τη λίστα των modules."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10061,7 +10058,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10103,7 +10100,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10130,7 +10127,7 @@ msgstr ""
 "Syntax: #MODLOAD# #FileName#\n"
 "Αυτή η εντολή φορτώνει ένα module από τη λίστα των modules."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10257,12 +10254,12 @@ msgid "Turn chanstats statistics on or off"
 msgstr "Ενεργοποιεί/απενεργοποιεί τη λειτουργία ασφάλειας ψευδώνυμου"
 
 #
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 msgid "Turn nickname security on or off"
 msgstr "Ενεργοποιεί/απενεργοποιεί τη λειτουργία ασφάλειας ψευδώνυμου"
 
 #
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 msgid "Turn protection on or off"
 msgstr "Ενεργοποιεί/απενεργοποιεί την προστασία με αποσύνδεση"
 
@@ -10302,7 +10299,7 @@ msgstr ""
 "ακόμη να πάρει πληροφορίες γι αυτό, χρησιμοποιώντας την\n"
 "εντολή #INFO#)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10334,7 +10331,7 @@ msgstr "Ενεργοποιεί/απενεργοποιεί τη λειτουργ
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "Ενεργοποιεί/απενεργοποιεί τη λειτουργία ασφάλειας ψευδώνυμου"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10365,7 +10362,7 @@ msgstr ""
 "είναι απολύτως απαραίτητο.  Επίσης, οι διαχειριστές του\n"
 "δικτύου μπορεί να έχουν απενεργοποιήσει αυτή την επιλογή."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10444,7 +10441,7 @@ msgstr ""
 "Γράψε #/msg %s HELP #επιλογή## για περισσότερες πληροφορίες\n"
 "για την κάθε εντολή."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10462,8 +10459,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "Κάνει unload ένα module."
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Το module #%s# δεν μπόρεσε να αφαιρεθεί."
@@ -10689,8 +10686,8 @@ msgstr "Η vhost για το group #%s# έγινε #%s#@#%s#."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 msgid "VIEW [mask | list | id]"
 msgstr ""
 
@@ -10835,12 +10832,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Είσαι ήδη μέλος της ομάδας του #%s#."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Είστε ήδη identified."
 
@@ -10869,6 +10866,11 @@ msgid "You are not permitted to change your memo limit."
 msgstr ""
 "Δεν έχεις το δικαίωμα να αλλάξεις το όριο των μηνυμάτων που θα λαμβάνεις."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Είστε ήδη identified."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10878,7 +10880,7 @@ msgstr "Τώρα είστε ένας SuperAdmin"
 msgid "You are now an IRC Operator."
 msgstr "Τώρα είστε IRC Operator."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -10947,8 +10949,8 @@ msgstr ""
 msgid "You can't %s yourself!"
 msgstr "Δεν μπορείς να σκοτώσεις τον εαυτό σου!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Δεν βρέθηκαν θέσεις στου %s στην access list."
@@ -10958,7 +10960,7 @@ msgstr "Δεν βρέθηκαν θέσεις στου %s στην access list."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Δεν μπορείτε να κάνετε Logout τον %s επειδή είναι Services Operator."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr ""
@@ -10974,7 +10976,7 @@ msgstr "Δεν μπορείς να θέσεις ως όριο μηνυμάτων
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Δεν μπορείς να θέσεις ως όριο μηνυμάτων μεγαλύτερο από %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr ""
 "Δεν μπορείς να απενεργοποιήσεις την διεύθυνση του e-mail σε αυτό το δίκτυο."
@@ -11049,7 +11051,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Γράψε #/msg %s READ %d# για να διαβάσεις."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Έχετε γίνει invite στο κανάλι #%s#."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Έχετε γίνει invite στο κανάλι #%s#."
@@ -11110,12 +11117,18 @@ msgstr "Διαγράφει τη vhost από όλα τα nicks σε ένα group
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr ""
 "Δεν μπορείς να απενεργοποιήσεις την διεύθυνση του e-mail σε αυτό το δίκτυο."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr ""
+"Δεν μπορείς να απενεργοποιήσεις την διεύθυνση του e-mail σε αυτό το δίκτυο."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11142,7 +11155,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "Δεν μπορείτε να κάνετε Logout τον %s επειδή είναι Services Operator."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11175,7 +11188,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -11188,7 +11201,7 @@ msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr ""
 "Θα πρέπει να έχετε κάνει identify για να χρησιμοποιήσετε αυτή την εντολή."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11198,11 +11211,6 @@ msgstr ""
 "Με αυτό το e-mail θα μπορείς να επανακτήσεις τον κωδικό σου σε\n"
 "περίπτωση που τον ξεχάσεις."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "#%s# δεν είναι σωστός τύπος ban"
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr ""
@@ -11261,16 +11269,16 @@ msgid "Your account %s has been successfully created."
 msgstr ""
 
 #
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 msgid "Your account is already confirmed."
 msgstr "Το account σας είναι ήδη επιβεβαιωμένο."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Το account σας θα λήξει αν δεν το κάνετε confirm σε %s"
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Το E-mail address για τον #%s# άλλαξε σε #%s#."
@@ -11280,7 +11288,7 @@ msgstr "Το E-mail address για τον #%s# άλλαξε σε #%s#."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Η διεύθνση email #%s# έχει επιβεβαιωθεί."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 #, fuzzy
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
@@ -11342,11 +11350,11 @@ msgstr ""
 "Το ψευδώνυμο σου δεν το κατέχεις τώρα,πρέπει να κάνεις πάλι εντολή "
 "αναγνώρισης για να το κατέχεις."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 msgid "Your nick is already registered."
 msgstr "Το Nickname %s κατωχυρώθηκε."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr ""
 "Το nick σας δεν είναι σε κάποιο group. Δεν μπορείτε να το κάνετε ungroup."
@@ -11355,7 +11363,7 @@ msgstr ""
 msgid "Your nick isn't registered."
 msgstr "Το Nickname %s κατωχυρώθηκε."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Το ψευδώνυμό σου έχει αλλάξει σε #%s#"
@@ -11364,12 +11372,12 @@ msgstr "Το ψευδώνυμό σου έχει αλλάξει σε #%s#"
 msgid "Your oper block doesn't require logging in."
 msgstr "To oper block σας δεν χρειάζεται login."
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Το passcode σας, ξαναστάλθηκε στο %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Ο κωδικός σου είναι #%s# - θυμηθείτε τον για μετέπειτα χρήση."
@@ -11378,7 +11386,7 @@ msgstr "Ο κωδικός σου είναι #%s# - θυμηθείτε τον γ
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Το αίτημά σας για αλλαγή του password έληξε."
 
@@ -11495,7 +11503,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "RSEND {#nick# | #channel#} #memo-text#"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 msgid "[nick]"
 msgstr ""
 
@@ -11503,8 +11511,8 @@ msgstr ""
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr ""
 
@@ -11524,7 +11532,7 @@ msgstr "CHANKILL [+#expiry#] {##channel#} [#reason#]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11686,11 +11694,3 @@ msgid "{channel | nickname}"
 msgstr "UNBAN #κανάλι# [#nick#]"
 
 #: modules/commands/ms_cancel.cpp:20
-#, fuzzy
-msgid "{nick | channel}"
-msgstr "RSEND {#nick# | #channel#} #memo-text#"
-
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
-#, fuzzy
-msgid "{nick | channel} memo-text"
-msgstr "RSEND {#nick# | #channel#} #memo-text#"
diff --git a/language/anope.es_ES.po b/language/anope.es_ES.po
index 63923406d..e5dca4167 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2014-02-24 20:45+0100\n"
 "Last-Translator: Isaac Fontal <i_fontal@hotmail.com>\n"
 "Language-Team: Spanish\n"
@@ -59,7 +59,7 @@ msgstr "%s añadido a la lista de bad words de %s."
 msgid "%s added to %s's access list."
 msgstr "%s añadido a la lista de acceso de %s."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s añadido a la lista de certificados de %s."
@@ -79,11 +79,6 @@ msgstr "%s añadido a la lista %s."
 msgid "%s added to the AKILL list."
 msgstr "%s añadido a la lista de AKILLs."
 
-#: modules/commands/ns_cert.cpp:180
-#, c-format
-msgid "%s added to your certificate list."
-msgstr "%s añadido a tu lista de certificados."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -121,7 +116,7 @@ msgstr ""
 "información sobre un comando específico, escribe\n"
 "%s%s %s comando.\n"
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -138,7 +133,7 @@ msgstr ""
 "Para más información acerca de un comando específico,\n"
 "escribe %s%s %s comando.\n"
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -229,7 +224,7 @@ msgstr "%s borrado de la lista de bad words de %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s borrado de la lista de acceso de %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s borrado de la lista de certificados de %s."
@@ -249,11 +244,6 @@ msgstr "%s borrado de la lista %s."
 msgid "%s deleted from the AKILL list."
 msgstr "%s borrado de la lista de AKILLs."
 
-#: modules/commands/ns_cert.cpp:209
-#, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s borrado de tu lista de certificados."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -336,7 +326,7 @@ msgstr "%s ya está en la lista de ignorados."
 msgid "%s is already suspended."
 msgstr "%s ya está suspendido."
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s no es un nick o canal registrado."
@@ -406,7 +396,7 @@ msgstr ""
 msgid "%s not found on %s %s list."
 msgstr "%s no encontrado en la lista de %s de %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s no encontrado en la lista de acceso de %s."
@@ -426,7 +416,7 @@ msgstr "%s no encontrado en la lista de bad words de %s."
 msgid "%s not found on %s's access list."
 msgstr "%s no encontrado en la lista de acceso de %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s no encontrado en la lista de certificados de %s."
@@ -587,6 +577,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "objetivo contraseña"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr "dirección"
@@ -595,11 +590,11 @@ msgstr "dirección"
 msgid "botname {ON|OFF}"
 msgstr "nombre-de-bot {ON|OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "canal"
 
@@ -623,8 +618,8 @@ msgstr "canal máscara [razón]"
 msgid "channel modes"
 msgstr "canal modos"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "canal nick"
 
@@ -660,7 +655,7 @@ msgstr "canal ADD máscara"
 msgid "channel ADD mask level"
 msgstr "canal ADD máscara nivel"
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 msgid "channel ADD message"
 msgstr "canal ADD mensaje"
 
@@ -676,9 +671,9 @@ msgstr "canal ADD {nick | máscara} [razón]"
 msgid "channel APPEND topic"
 msgstr "canal APPEND topic"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr "canal CLEAR"
 
@@ -690,11 +685,11 @@ msgstr "canal CLEAR [que]"
 msgid "channel CLEAR [ALL]"
 msgstr "canal CLEAR [ALL]"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 msgid "channel DEL num"
 msgstr "canal DEL num"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "canal DEL {máscara | num-entrada | lista}"
 
@@ -710,7 +705,7 @@ msgstr "canal DEL {palabra | num-entrada | lista}"
 msgid "channel ENFORCE"
 msgstr "canal ENFORCE"
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr "canal LIST"
 
@@ -718,8 +713,8 @@ msgstr "canal LIST"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "canal LIST [máscara | num-entrada | lista]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr "canal LIST [máscara | lista]"
 
@@ -759,11 +754,11 @@ msgstr "canal VIEW [máscara | num-entrada | lista]"
 msgid "channel VIEW [mask | list]"
 msgstr "canal VIEW [máscara | lista]"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "canal [descripción]"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "canal [nick]"
 
@@ -787,8 +782,8 @@ msgstr "canal [+expiración] {nick | máscara} [razón]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "canal [UNLOCK|LOCK]"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 msgid "channel {ON|OFF}"
 msgstr "canal {ON|OFF}"
 
@@ -819,13 +814,13 @@ msgstr "canal {DIS | DISABLE} tipo"
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "canal {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "canal {ON | OFF}"
 
@@ -833,7 +828,7 @@ msgstr "canal {ON | OFF}"
 msgid "email"
 msgstr "email"
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 msgid "language"
 msgstr "idioma"
 
@@ -845,8 +840,8 @@ msgstr "texto-del-memo"
 msgid "message"
 msgstr "mensaje"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr "nombre-del-módulo"
 
@@ -858,10 +853,10 @@ msgstr "nuevo-display"
 msgid "new-password"
 msgstr "nueva-contraseña"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr "nick"
 
@@ -885,12 +880,12 @@ msgstr "nick nuevo-nick"
 msgid "nick [reason]"
 msgstr "nick [razón]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "nick"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 msgid "nickname address"
 msgstr "nick dirección"
 
@@ -898,7 +893,7 @@ msgstr "nick dirección"
 msgid "nickname email"
 msgstr "nick email"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 msgid "nickname language"
 msgstr "nick idioma"
 
@@ -930,14 +925,14 @@ msgstr "nick [+expiración] [razón]"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "nick {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "nick {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "nick {ON | QUICK | IMMED | OFF}"
 
@@ -993,10 +988,6 @@ msgstr "patrón [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "servidor [razón]"
 
-#: modules/commands/ns_group.cpp:78
-msgid "target password"
-msgstr "objetivo contraseña"
-
 #: modules/commands/os_mode.cpp:139
 msgid "user modes"
 msgstr "usuario modos"
@@ -1005,7 +996,7 @@ msgstr "usuario modos"
 msgid "user [reason]"
 msgstr "usuario [razón]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, c-format
 msgid ""
 " \n"
@@ -1085,7 +1076,7 @@ msgstr ""
 "expiración predeterminado de una SQLINE se puede ver con\n"
 "el comandoSTATS AKILL."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, c-format
 msgid ""
 " \n"
@@ -1225,7 +1216,7 @@ msgstr ""
 "obtener información sobre como dar parte de estos privilegios\n"
 "a otros usuarios del canal.\n"
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -1545,7 +1536,7 @@ msgstr " Cargado en: %p"
 msgid " but %s mysteriously dematerialized."
 msgstr " pero %s misteriosamente desmaterializado."
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1601,7 +1592,7 @@ msgstr "%d bots disponibles."
 msgid "%d modules loaded."
 msgstr "%d módulos cargados."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nick(s) en el grupo."
@@ -1706,9 +1697,9 @@ msgstr "%s (%s) fue visto por última vez desconectando (%s) hace %s (%s)."
 msgid "%s (minimum %d/%d%%)"
 msgstr "%s (mínimo %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista de acceso de %s esta vacía."
@@ -1739,8 +1730,8 @@ msgstr "La lista de bad words de %s está vacía."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s no puede ser el sucesor en el canal %s ya que es el fundador."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Comandos para %s:"
@@ -2013,7 +2004,7 @@ msgstr "La lista de auto join de %s está vacía."
 msgid "%s's auto join list:"
 msgstr "Lista de auto join de %s:"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, c-format
 msgid "%s's certificate list is empty."
 msgstr "La lista de certificados de %s está vacía."
@@ -2115,7 +2106,7 @@ msgstr ". %s todavía está en línea."
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2180,15 +2171,16 @@ msgstr "ADD [+expiración] máscara límite razón"
 msgid "ADD [nickname] channel [key]"
 msgstr "ADD [nick] canal [clave]"
 
-#: modules/commands/ns_cert.cpp:251
-msgid "ADD [nickname] fingerprint"
-msgstr "ADD [nick] huella"
-
 #: modules/commands/ns_access.cpp:102
 msgid "ADD [nickname] mask"
 msgstr "ADD [nick] máscara"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "ADD [nick] huella"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr "ADD [+expiración] máscara razón"
 
@@ -2263,7 +2255,7 @@ msgstr "Opciones del nivel de acceso para el canal %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Niveles de acceso para %s resetados a los valores originales."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista de acceso para %s:"
@@ -2400,7 +2392,7 @@ msgstr "Todos los memos para el canal %s han sido borrados."
 msgid "All modes cleared on %s."
 msgstr "Se han limpiado todos los modos en %s."
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2435,12 +2427,12 @@ msgstr "Todas la configuración de %s ha sido clonada a %s."
 msgid "All user modes on %s have been synced."
 msgstr "Todas los modos de usuario en %s han sido sincronizados."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, 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 establecidos a %s"
 
-#: modules/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, 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 establecidos a %s@%s."
@@ -2862,7 +2854,7 @@ msgstr ""
 "Ejemplo:\n"
 "     MODIFY nickserv forcemail no"
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
 "the given user. With MSG set, Services will use messages,\n"
@@ -2872,7 +2864,7 @@ msgstr ""
 "el usuario dado. Con MSG establecido, los Servicios usarán mensajes,\n"
 "si no, usarán notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3021,11 +3013,11 @@ msgstr "Asociar un e-mail con tu nick"
 msgid "Associate oper info with a nick or channel"
 msgstr "Asociar información de operador con un nick o con un canal"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 msgid "Associates the given E-mail address with the nickname."
 msgstr "Asocia el e-mail dado con el nick."
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
 "This address will be displayed whenever someone requests\n"
@@ -3035,7 +3027,7 @@ msgstr ""
 "mostrada cuando alguien pida información sobre el\n"
 "nick con el comando INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3334,8 +3326,8 @@ msgstr "El bot ya no kickeará por flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "El bot ya no kickeará por repetir."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr "Por"
 
@@ -3373,7 +3365,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "¡No se puede clonar el canal %s a sí mismo!"
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Imposible enviar el e-mail ahora; por favor inténtalo más tarde."
 
@@ -3428,7 +3420,7 @@ msgstr ""
 "Hace que los Servicios actualicen la base de datos en\n"
 "cuanto envíes el comando."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, c-format
 msgid "Certificate list for %s:"
 msgstr "Lista de certificados para %s:"
@@ -3442,7 +3434,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "Cambiar modos de canal"
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 msgid "Change the communication method of Services"
 msgstr "Cambiar el método de comunicacion con los Servicios"
 
@@ -3479,7 +3471,7 @@ msgstr ""
 "Cambia el fundador de un canal. El nuevo nick debe estar\n"
 "registrado."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
@@ -3491,7 +3483,7 @@ msgstr ""
 "idioma debe ser uno de los de la siguiente lista de idiomas\n"
 "soportados:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
@@ -3527,7 +3519,7 @@ msgstr ""
 "el sucesor se convertirá en el nuevo fundador del canal.\n"
 "El nuevo nick debe estar registrado."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 msgid "Channel"
 msgstr "Canal"
 
@@ -3611,7 +3603,7 @@ msgstr "El canal %s no expirará."
 msgid "Channel %s %s list has been cleared."
 msgstr "La lista de %s de %s ha sido limpiada."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista de acceso para el canal %s ha sido limpiada."
@@ -3645,8 +3637,8 @@ msgstr "Lista de canales:"
 msgid "Channel stats for %s on %s:"
 msgstr "Estadísticas de canal para %s en %s:"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 msgid "Channels may not be on access lists."
 msgstr "Los canales no pueden estar en las listas de acceso."
 
@@ -3801,7 +3793,7 @@ msgstr "Confirmar un código"
 msgid "Control modes and mode locks on a channel"
 msgstr "Controlar modos y bloqueos de modos en un canal"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -3823,20 +3815,20 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Copia toda la configuración de un canal a otro"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 msgid "Created"
 msgstr "Creado"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 msgid "Creator"
 msgstr "Creador"
 
@@ -3889,7 +3881,7 @@ msgstr "DEL objetivo info"
 msgid "DEL [nickname] channel"
 msgstr "DEL [nick] canal"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 msgid "DEL [nickname] fingerprint"
 msgstr "DEL [nick] huella"
 
@@ -3897,8 +3889,8 @@ msgstr "DEL [nick] huella"
 msgid "DEL [nickname] mask"
 msgstr "DEL [nick] máscara"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL {máscara | entrada-num | lista | id}"
 
@@ -4206,8 +4198,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr "%s sacado del pool dns."
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 msgid "Description"
 msgstr "Descripción"
 
@@ -4359,12 +4351,12 @@ msgstr ""
 "perderás tus accesos y los canales que poseas. Cualquier otro\n"
 "usuario podrá tomar el control de ese nick."
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Dirección e-mail para %s cambiada a %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Dirección e-mail para %s borrada."
@@ -4431,7 +4423,7 @@ msgstr "Habilitar comandos fantasía"
 msgid "Enable greet messages"
 msgstr "Activar mensajes de saludo"
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr "Activa o desactiva la conservación de modos"
 
@@ -4462,7 +4454,7 @@ msgstr ""
 "los modos del usuario e intentarán restablecerlos la próxima vez que\n"
 "se cree el canal."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
@@ -4473,7 +4465,7 @@ msgstr ""
 "los modos del usuario e intentarán restablecerlos la próxima vez que\n"
 "se identifique."
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -4660,7 +4652,7 @@ msgstr "Fin de la lista de canales."
 msgid "End of configuration."
 msgstr "Fin de la configuración."
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 msgid "End of entry message list."
 msgstr "Fin de la lista de mensajes de entrada."
 
@@ -4678,7 +4670,7 @@ msgstr "Fin de la lista de prohibiciones."
 msgid "End of list - %d channels shown."
 msgstr "Fin de la lista - %d canales mostrados."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la lista - %d/%d resultado(s) mostrado(s)."
@@ -4726,37 +4718,37 @@ msgstr ""
 "de usuarios en el canal sea inferior al límite del canal, si está "
 "establecido."
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Español"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Mensaje de entrada %i para %s borrado."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Mensaje de entrada %s no encontrado en el canal %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, c-format
 msgid "Entry message added to %s"
 msgstr "Mensaje de entrada añadido a %s"
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, c-format
 msgid "Entry message list for %s is empty."
 msgstr "La lista de mesnsajes de entrada para %s está vacía."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, c-format
 msgid "Entry message list for %s:"
 msgstr "Lista de mensajes de entrada para %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "El mensaje de entrada para %s ha sido borrado."
@@ -4784,7 +4776,7 @@ msgstr ""
 "¡Error! El vhost es demasiado largo, por favor, usa un host de menos de %d "
 "caracteres."
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -4822,12 +4814,12 @@ msgstr "La excepción para %s (#%d) movida a la posicion %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "La excepción para %s ha sido actualizada a %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 msgid "Expires"
 msgstr "Expira"
 
@@ -4841,7 +4833,7 @@ msgstr "Tiempo de expiración y razón actualizados para %s."
 msgid "Expiry for %s updated."
 msgstr "Tiempo de expiración para %s actualizado."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasía"
 
@@ -4859,11 +4851,16 @@ msgstr "Modo fantasía ahora Activado en el canal %s."
 msgid "Find a user's status on a channel"
 msgstr "Encontrar el status de un usuario en un canal"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "La huella %s ya está presente en la lista de certificados de %s."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "%s ya está en %s."
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr "Marcas"
@@ -5081,11 +5078,11 @@ msgstr "La lista de ignorados está vacía."
 msgid "Ignore list:"
 msgstr "Lista de ignorados:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 msgid "Immediate protection"
 msgstr "Proteccion inmediata"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 msgid "Incorrect email address."
 msgstr "Dirección de email incorrecta."
 
@@ -5170,16 +5167,16 @@ msgstr "Kick por cursivas"
 msgid "Join a group"
 msgstr "Entrar en un grupo"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 msgid "Keep modes"
 msgstr "Guardar modos"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Guardar modos para %s Desactivado."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Guardar modos para %s Activado."
@@ -5197,7 +5194,7 @@ msgstr "La clave para el canal %s es %s."
 msgid "Kick a user from a channel"
 msgstr "Kickear un usuario de un canal"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr "Kickeados %d/%d usuarios que coinciden con %s en %s."
@@ -5236,8 +5233,8 @@ msgstr "LIMIT forzado en %s, %d usuarios eliminados."
 msgid "LIST threshold"
 msgstr "LIST umbral"
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr "LIST [máscara | lista | id]"
 
@@ -5245,8 +5242,8 @@ msgstr "LIST [máscara | lista | id]"
 msgid "LIST [mask | list]"
 msgstr "LIST [máscara | lista]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 msgid "LIST [nickname]"
 msgstr "LIST [nick]"
 
@@ -5254,7 +5251,7 @@ msgstr "LIST [nick]"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|número]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Idioma cambiado a Español."
 
@@ -5267,7 +5264,7 @@ msgstr "El último memo enviado a %s ha sido cancelado."
 msgid "Last quit message"
 msgstr "Último mensaje quit"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 msgid "Last seen"
 msgstr "Última vez visto"
 
@@ -5279,7 +5276,7 @@ msgstr "Última dirección vista"
 msgid "Last topic"
 msgstr "Último topic"
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 msgid "Last used"
 msgstr "Usado por última vez"
 
@@ -5307,8 +5304,8 @@ msgstr "El nivel para %s en el canal %s cambiado a solo fundador."
 msgid "Level must be between %d and %d inclusive."
 msgstr "El nivel debe estar entre %d y %d inclusive."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr "Límite"
 
@@ -5329,17 +5326,17 @@ msgstr "La lista para el modo %c está llena."
 msgid "List loaded modules"
 msgstr "Listar módulos cargados"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista de entradas que coinciden con %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicks en el grupo de %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicks en tu grupo:"
 
@@ -5391,7 +5388,7 @@ msgstr ""
 "delante una marca de exclamación. El parámetro nick está limitado\n"
 "a Operadores de Servicios"
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 msgid "Lists all nicknames in your group"
 msgstr "Lista todos los nicks en tu grupo"
 
@@ -5885,7 +5882,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Administra las zonas DNS para esta red"
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 msgid "Manage the channel's entry messages"
 msgstr "Administrar los mensajes de entrada al canal"
 
@@ -5914,15 +5911,15 @@ msgstr "Manipula el sistema DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "Manipula el topic del canal especificado"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr "Máscara"
 
@@ -5935,8 +5932,8 @@ msgstr "La máscara %s ya está presente en la lista de acceso de %s."
 msgid "Mask must be in the form user@host."
 msgstr "La máscara debe ser en formato usuario@host"
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 msgid "Masks and unregistered users may not be on access lists."
 msgstr ""
 "Las listas de acceso no pueden contener máscaras o usuarios no registrados."
@@ -5984,7 +5981,7 @@ msgstr "Límite de memos para %s establecido a %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Límite de memos para %s establecido a 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado a %s."
@@ -5994,11 +5991,11 @@ msgstr "Memo enviado a %s."
 msgid "Memos for %s:"
 msgstr "Memos para %s:"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 msgid "Message"
 msgstr "Mensaje"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Modo de mensaje"
 
@@ -6076,7 +6073,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Muestra la lista de acceso actual."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6104,11 +6101,11 @@ msgstr "Modificar la lista de usuarios %s"
 msgid "Modify the list of authorized addresses"
 msgstr "Modificar la lista de direcciones autorizadas"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 msgid "Modify the list of privileged users"
 msgstr "Modificar la lista de usuarios privilegiados"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 msgid "Modify the nickname client certificate list"
 msgstr "Modificar la lista de certificados del nick"
 
@@ -6159,10 +6156,10 @@ msgstr "Módulo: %s Versión: %s  Autor: %s Cargado: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Módulo: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr "Nombre"
 
@@ -6179,9 +6176,9 @@ msgstr "Estadísticas de red para %s:"
 msgid "Never"
 msgstr "Nunca"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 msgid "Nick"
 msgstr "Nick"
 
@@ -6245,12 +6242,12 @@ msgstr "El nick %s no está registrado."
 msgid "Nick %s was truncated to %d characters."
 msgstr "El nick %s fue reducido a %d caracteres."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "El nick %s sí expirará."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "El nick %s no expirará."
@@ -6265,7 +6262,7 @@ msgstr "El nick %s no ha recibido ningun memo tuyo."
 msgid "Nick %s has been logged out."
 msgstr "El nick %s ha sido desconectado."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "El nick %s ha sido desagrupado de %s."
@@ -6275,7 +6272,7 @@ msgstr "El nick %s ha sido desagrupado de %s."
 msgid "Nick %s is currently suspended."
 msgstr "El nick %s está actualmente suspendido."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, c-format
 msgid "Nick %s is not in your group."
 msgstr "El nick %s no está en tu grupo."
@@ -6315,17 +6312,17 @@ msgstr "¡El nick %s ya está registrado!"
 msgid "Nickname %s may not be registered."
 msgstr "El nick %s no puede ser registrado."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Nick %s registrado bajo tu máscara usuario@host: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, c-format
 msgid "Nickname %s registered."
 msgstr "Nick %s registrado."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 msgid "No auto-op"
 msgstr "No auto-op"
 
@@ -6333,7 +6330,7 @@ msgstr "No auto-op"
 msgid "No bot"
 msgstr "No hay bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 msgid "No expire"
 msgstr "No expira"
 
@@ -6366,8 +6363,8 @@ msgstr "No se encontraron coincidencias para %s."
 msgid "No matching entries on %s %s list."
 msgstr "No hay entradas que coincidan en la lista de %s de %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "No hay entradas que concuerden en la lista de acceso de %s ."
@@ -6441,8 +6438,8 @@ msgstr "No se encontraron peticiones para el nick %s."
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "No se firman los kicks cuando se usa SIGNKICK LEVEL"
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, c-format
 msgid "No stats for %s."
 msgstr "No hay estadísticas para %s."
@@ -6452,7 +6449,7 @@ msgstr "No hay estadísticas para %s."
 msgid "No such info \"%s\" on %s."
 msgstr "No existe la información \"%s\" en %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, c-format
 msgid "No users on %s match %s."
 msgstr "Ningún usuario en %s concuerda con %s."
@@ -6480,17 +6477,17 @@ msgstr "Ninguno"
 msgid "Nothing to do."
 msgstr "Nada que hacer."
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr "Número"
 
@@ -6611,12 +6608,12 @@ msgstr "La contraseña para %s es %s."
 msgid "Password incorrect."
 msgstr "Contraseña incorrecta."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Ha sido enviado un email de restablecimiento de contraseña para %s."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Paz"
 
@@ -6630,7 +6627,7 @@ msgstr "Opción de paz para %s Desactivada."
 msgid "Peace option for %s is now on."
 msgstr "Opción de paz para %s Activada."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 msgid "Persistent"
 msgstr "Persistente"
 
@@ -6670,19 +6667,19 @@ msgstr "Por favor, espera %d segundos e inténtalo de nuevo."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Por favor, espera %d segundos antes de solicitar un nuevo vHost."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
 "Por favor, espera %d segundos antes de utilizar el comando %s nuevamente."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -6721,7 +6718,7 @@ msgstr "Evita que el canal expire"
 msgid "Prevent the nickname from appearing in the LIST command"
 msgstr "Evita que el nick aparezca en el comando LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 msgid "Prevent the nickname from expiring"
 msgstr "Evita que el nick expire"
 
@@ -6729,8 +6726,8 @@ msgstr "Evita que el nick expire"
 msgid "Prevents users being kicked by Services"
 msgstr "Evita que los usuarios sean kickeados por los Servicios"
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privado"
 
@@ -6774,27 +6771,27 @@ msgstr "Privilegios de %s dados a %s en %s, las nuevas marcas son +%s"
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr "Privilegios de %s quitados  a %s en %s, las nuevas marcas son +%s"
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Protección"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, c-format
 msgid "Protection is now off for %s."
 msgstr "La protección para %sahora está Desactivada."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, c-format
 msgid "Protection is now on for %s, with a reduced delay."
 msgstr ""
 "La protección está ahora Activada para %s, con tiempo de espera reducido."
 
-#: modules/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "La protección está ahora Activada para %s, sin tiempo de espera."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, c-format
 msgid "Protection is now on for %s."
 msgstr "La protección para %sahora está Activada."
@@ -6809,7 +6806,7 @@ msgstr ""
 "la máscara completa ident@host para cada nick, luego\n"
 "fuerza el AKILL."
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 msgid "Quick protection"
 msgstr "Proteccion rápida"
 
@@ -6851,11 +6848,11 @@ msgstr "Leer un memo o memos"
 msgid "Real name"
 msgstr "Nombre real"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr "Razón"
 
@@ -6887,13 +6884,13 @@ msgstr "Redefine el significado de los niveles de acceso"
 msgid "Regains control of your nick"
 msgstr "Recupera el control de tu nick"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 msgid "Regex is disabled."
 msgstr "Regex está deshabilitado."
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -6903,8 +6900,8 @@ msgstr ""
 "Encierra tu máscara entre // si lo deseas."
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -6976,7 +6973,7 @@ msgstr ""
 "le dará status de operador del canal automáticamente\n"
 "al entrar al canal."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7051,7 +7048,7 @@ msgstr "Recargar un módule"
 msgid "Reload services' configuration file"
 msgstr "Recargar la configuración de los Servicios"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 msgid "Remove a nick from a group"
 msgstr "Eliminar un nick de un grupo"
 
@@ -7130,7 +7127,7 @@ msgstr ""
 "administradores de la red. Por favor, ten paciencia mientras\n"
 "tu petición es considerada."
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 msgid "Resend registration confirmation email"
 msgstr "Reenviar email de confirmación"
 
@@ -7138,7 +7135,7 @@ msgstr "Reenviar email de confirmación"
 msgid "Restrict access to the channel"
 msgstr "Restringir el acceso al canal"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 msgid "Restricted access"
 msgstr "Acceso restringido"
 
@@ -7261,12 +7258,12 @@ msgstr "SET servidor"
 msgid "SET server.name option value"
 msgstr "SET nombre-servidor opción valor"
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Huella SSL aceptada, ahora estás identificado en %s."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Huella SSL aceptada, ahora estás identificado."
 
@@ -7287,7 +7284,7 @@ msgstr "Guardar la base de datos y reiniciar los Servicios"
 msgid "Searches logs for a matching pattern"
 msgstr "Busca registros con el patrón dado"
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 msgid "Secure founder"
 msgstr "Fundador Seguro"
 
@@ -7301,7 +7298,7 @@ msgstr "Seguridad de fundador para %s Desactivada."
 msgid "Secure founder option for %s is now on."
 msgstr "Seguridad de fundador para %s Activada."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 msgid "Secure ops"
 msgstr "Ops Seguros"
 
@@ -7325,12 +7322,12 @@ msgstr "Seguridad para %s ahora Desactivada."
 msgid "Secure option for %s is now on."
 msgstr "Seguridad para %s ahora Activada."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, c-format
 msgid "Secure option is now off for %s."
 msgstr "Seguridad Desactivada para %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, c-format
 msgid "Secure option is now on for %s."
 msgstr "Seguridad Activada para %s."
@@ -7340,7 +7337,7 @@ msgstr "Seguridad Activada para %s."
 msgid "Secureops enforced on %s."
 msgstr "Seguridad de OPs forzada en %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Seguridad"
 
@@ -7386,7 +7383,7 @@ msgstr "Remitente"
 msgid "Sends a memo and requests a read receipt"
 msgstr "Envía un memo con confirmación de lectura"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
 "reset their password.  Email must be the email address associated\n"
@@ -7622,12 +7619,12 @@ msgid "Services will now automatically give modes to users in %s."
 msgstr ""
 "Los Servicios establecerán automáticamente los modos de los usuarios en %s."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Los Services ahora responderán a %s con mensajes."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Los Services ahora responderán a %s con notices."
@@ -7690,7 +7687,7 @@ msgstr "Establece el display de tu grupo en los Servicios"
 msgid "Set the founder of a channel"
 msgstr "Establece el fundador de un canal"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 msgid "Set the language Services will use when messaging you"
 msgstr "Establece el idioma en el que los Servicios te enviarán mensajes"
 
@@ -8049,7 +8046,7 @@ msgstr ""
 "de la configuración del canal, algún modo puede no ser establecido\n"
 "automáticamente."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
@@ -8133,11 +8130,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Opción de kick firmado para %s Activada."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Kicks Firmados"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "Lo siento, %s tiene muchos memos actualmente y no puede recibir más."
@@ -8151,12 +8148,12 @@ msgstr "Lo siento, no he visto a %s."
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Lo siento, la asignación de bots está temporalmente deshabilitada."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Lo siento, la modificación de bots está temporalmente deshabilitada."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Lo siento, la configuración de opciones del bot está temporalmente "
@@ -8170,7 +8167,7 @@ msgstr ""
 "Lo siento, la modificación de la lista %s de canal está temporalmente "
 "deshabilitada."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Lo siento, la modificación de acceso a canales está temporalmete "
@@ -8215,7 +8212,7 @@ msgstr "Lo siento, el envío de memos está temporalmente deshabilitado."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Lo siento, el borrado de nicks esta temporalmente deshabilitado."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Lo siento, la agrupación de nicks esta temporalmente deshabilitada."
 
@@ -8234,13 +8231,13 @@ msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 "Lo siento, se ha alcanzado el máximo de %d entradas de la lista de auto join."
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Lo siento, solo puedes tener %d entradas en tu lista de certificados."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8370,7 +8367,7 @@ msgstr ""
 "Sincroniza todos los modos establecidos a los usuarios de un\n"
 "canal con los modos que deberían tener en función de su acceso."
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "Sincroniza el vhost con todos los nicks del grupo"
 
@@ -8378,7 +8375,7 @@ msgstr "Sincroniza el vhost con todos los nicks del grupo"
 msgid "Syntax"
 msgstr "Sintaxis"
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8389,7 +8386,7 @@ msgstr ""
 " \n"
 "Lista todos los nicks en tu grupo."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -8615,7 +8612,7 @@ msgstr ""
 "misma que usaste con el comando REGISTER (si no\n"
 "la has cambiado)."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -8802,7 +8799,7 @@ msgstr ""
 " \n"
 "El comando CLEAR borra todas las entradas de la lista."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
@@ -8811,7 +8808,7 @@ msgstr ""
 "El comando ENTRYMSG ADD añade el mensaje dado a la lista\n"
 "de mensajes a ser mostrados a los usuarios cuando entran al canal."
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8821,7 +8818,7 @@ msgstr ""
 "la lista de mensajes a ser mostrados a los usuarios cuando entran\n"
 "al canal."
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8833,7 +8830,7 @@ msgstr ""
 "Puedes borrar el mensaje especificando su número, el cual puedes\n"
 "obtener listando todos los mensajes como se explica más abajo."
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
@@ -8841,7 +8838,7 @@ msgstr ""
 "El comando ENTRYMSG LIST muestra una lista de mensajes a ser\n"
 "mostrados a los usuario al entrar al canal."
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "La opcion IMMED no está disponible en esta red."
 
@@ -8935,7 +8932,7 @@ msgstr ""
 "El comando STATS imprime estadísticas sobre nicks almacenados y uso de "
 "memoria."
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 msgid ""
 "The email parameter is optional and will set the email\n"
 "for your nick immediately.\n"
@@ -9036,7 +9033,17 @@ msgstr ""
 "pre-definido de restricciones que son muy útiles en un eventual\n"
 "ataque a la red."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr "Este email ha alcanzado su límite de uso de %d usuarios."
+
+#: modules/ns_maxemail.cpp:28
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr "Este email ha alcanzado su límite de uso de 1 usuario."
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, c-format
 msgid "The entry message list for %s is full."
 msgstr "La lista de mensajes de entrada para %s está llena."
@@ -9045,15 +9052,6 @@ msgstr "La lista de mensajes de entrada para %s está llena."
 msgid "The following feature/function names are available:"
 msgstr "Están disponibles las siguientes funciones/características:"
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr "Este email ha alcanzado su límite de uso de %d usuarios."
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "Este email ha alcanzado su límite de uso de 1 usuario."
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9195,7 +9193,7 @@ msgstr "No hay servidores configurados."
 msgid "There are no forbids of type %s."
 msgstr "No hay prohibiciones del tipo %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 msgid "There are too many nicks in your group."
 msgstr "Hay demasiados nicks en tu grupo."
 
@@ -9310,7 +9308,7 @@ msgstr ""
 "Los comandos POOL y DEPOOL  realmente añaden y eliminan servidores de sus "
 "zonas dadas."
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 msgid ""
 "This command allows users to set the vhost of their\n"
 "CURRENT nick to be the vhost for all nicks in the same\n"
@@ -9320,7 +9318,7 @@ msgstr ""
 "de su nick ACTUAL como vhost para todos los nicks del\n"
 "mismo grupo."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9388,7 +9386,7 @@ msgstr ""
 "Este comando carga el módulo llamado nombre-del-módulo desde el\n"
 "directorio de módulos."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 msgid ""
 "This command makes your nickname join the target nickname's\n"
 "group. password is the password of the target nickname.\n"
@@ -9455,7 +9453,7 @@ msgstr ""
 "Los Operadores de Servicios pueden especificar un nick para modificar\n"
 "las listas auto join de otros usuarios."
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -9511,7 +9509,7 @@ msgstr ""
 "con el usuario. El uso de este comando está limitado a los usuarios\n"
 "que pueden modificar la lista de acceso del canal."
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
@@ -9529,7 +9527,7 @@ msgstr ""
 msgid "This command unloads the module named modname."
 msgstr "Este comando descarga el módulo llamado nombre-del-módulo."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr "Este comando te reenviará el email de confirmación del registro."
 
@@ -9656,11 +9654,11 @@ msgstr "¡Apaga las mayusculas!"
 msgid "Turn chanstats statistics on or off"
 msgstr "Pone las estadísticas de canal a on u off."
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 msgid "Turn nickname security on or off"
 msgstr "Pone la seguridad del nick a on u off."
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 msgid "Turn protection on or off"
 msgstr "Pone la protección a on u off."
 
@@ -9694,7 +9692,7 @@ msgstr ""
 "(Sin embargo, cualquier persona que sepa tu nick podrá\n"
 "comprobar tu información usando el comando INFO.)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -9720,7 +9718,7 @@ msgstr "Pone las estadísticas de canal a ON u OFF."
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "Pone las estadísticas de canal para este usuario a ON u OFF."
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -9749,7 +9747,7 @@ msgstr ""
 "necesario. Además, los administradores de la red pueden haber\n"
 "deshabilitado esta opción."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -9826,7 +9824,7 @@ msgstr ""
 "Escribe %s%s HELP %s opción para más información\n"
 "sobre una opción en particular."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -9840,8 +9838,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "Descargar un módulo"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Imposible encontrar el motor regex %s."
@@ -10050,8 +10048,8 @@ msgstr "VHost para el grupo %s establecido a %s@%s."
 msgid "VIEW host"
 msgstr "VIEW host"
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 msgid "VIEW [mask | list | id]"
 msgstr "VIEW [máscara | lista | id]"
 
@@ -10190,12 +10188,12 @@ msgstr ""
 msgid "Word"
 msgstr "Palabra"
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Ya eres miembro del grupo de %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Ya estás identificado."
 
@@ -10220,6 +10218,11 @@ msgstr "No se te permite estar en este canal."
 msgid "You are not permitted to change your memo limit."
 msgstr "No estas autorizado a cambiar tu límite de memos."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "No estás identificado."
+
 #: modules/commands/os_set.cpp:85
 msgid "You are now a super admin."
 msgstr "Ahora eres un SuperAdmin."
@@ -10228,7 +10231,7 @@ msgstr "Ahora eres un SuperAdmin."
 msgid "You are now an IRC Operator."
 msgstr "Eres ahora un operador de IRC."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 msgid "You are now identified for your nick. Change your password now."
 msgstr "Ahora estás identificado para tu nick. Cambia tu contraseña ahora."
 
@@ -10293,8 +10296,8 @@ msgstr ""
 msgid "You can't %s yourself!"
 msgstr "¡No puedes %s a ti mismo!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 msgid "You can't add a channel to its own access list."
 msgstr "No puedes añadir un canal a su propia lista de acceso."
 
@@ -10303,7 +10306,7 @@ msgstr "No puedes añadir un canal a su propia lista de acceso."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "No puedes desconectar a %s porque es un Operador de Servicios."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, c-format
 msgid "You cannot %s on this network."
 msgstr "No puedes %s en esta red."
@@ -10318,7 +10321,7 @@ msgstr "No puedes establecer el límite de memos para %s a más de %d."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "No puedes establecer tu límite de memos a más de %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "No puedes borrar tu direccion de e-mail en esta red."
 
@@ -10391,7 +10394,12 @@ msgstr ""
 "Tienes un nuevo memo de %s.\n"
 "Escribe %s%s READ %d para leerlo."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Has sido invitado a %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Has sido invitado a %s."
@@ -10445,10 +10453,15 @@ msgstr "Puedes borrar cualquier nick de tu grupo."
 msgid "You may not (un)lock mode %c."
 msgstr "No puedes (des)bloquear el modo %c"
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "No puedes cambiar el e-mail de otro Operador de Servicios."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "No puedes cambiar el e-mail de otro Operador de Servicios."
+
 #: modules/commands/ns_set.cpp:191
 msgid "You may not change the password of other Services Operators."
 msgstr "No puedes cambiar la contraseña de otro Operador de Servicios."
@@ -10472,7 +10485,7 @@ msgstr ""
 "Puedes ver pero no modificar la lista de acceso de otro Operador de "
 "Servicios."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
 msgstr ""
@@ -10505,7 +10518,7 @@ msgstr ""
 "Debes introducir el nombre del canal dos veces como confirmación de que "
 "quieres borrar %s."
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr "Debes estar conectado más de %d segundos para registrar tu nick."
@@ -10515,7 +10528,7 @@ msgstr "Debes estar conectado más de %d segundos para registrar tu nick."
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "Debes tener el privilegio %s(ME) en el canal para usar este comando."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -10525,10 +10538,6 @@ msgstr ""
 "Este e-mail te permitirá recuperar tu clave en\n"
 "caso de que la olvides."
 
-#: modules/commands/ns_register.cpp:135
-msgid "You must specify an email address."
-msgstr "Debes especificar una dirección de email."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "Tienes que estar identificado para usar este comando."
@@ -10589,16 +10598,16 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Tu cuenta %s ha sido creada correctamente."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 msgid "Your account is already confirmed."
 msgstr "Tu cuenta ya está confirmada."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Tu cuenta expirará si no es confirmada en %s"
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Tu dirección email ha sido cambiada a %s."
@@ -10607,7 +10616,7 @@ msgstr "Tu dirección email ha sido cambiada a %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Tu dirección de email no está permitida, escoje otra diferente."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -10665,11 +10674,11 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Tu nick ha sido desconectado."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 msgid "Your nick is already registered."
 msgstr "Tu nick ya está registrado."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Tu nick no está agrupado a nada, no puedes desagruparlo."
 
@@ -10677,7 +10686,7 @@ msgstr "Tu nick no está agrupado a nada, no puedes desagruparlo."
 msgid "Your nick isn't registered."
 msgstr "Tu nick no está registrado."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Tu nick se ha cambiado a %s"
@@ -10686,12 +10695,12 @@ msgstr "Tu nick se ha cambiado a %s"
 msgid "Your oper block doesn't require logging in."
 msgstr "Tu bloque de operador no requiere inicio de sesión."
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Tu contraseña ha sido reenviada a %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Tu contraseña es %s - Recuérdala para usos futuros."
@@ -10702,7 +10711,7 @@ msgstr ""
 "Tu contraseña es demasiado larga. Por favor, inténtalo de nuevo con una más "
 "corta."
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Tu petición de restablecimiento de contraseña ha expirado."
 
@@ -10809,7 +10818,7 @@ msgstr "[clave|#X-Y]"
 msgid "[nick | channel]"
 msgstr "[nick | canal]"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 msgid "[nick]"
 msgstr "[nick]"
 
@@ -10817,8 +10826,8 @@ msgstr "[nick]"
 msgid "[nickname [REVALIDATE]]"
 msgstr "[nick [REVALIDATE]]"
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr "[nick]"
 
@@ -10838,7 +10847,7 @@ msgstr "[+expiración] canal razón"
 msgid "[Hostname hidden]"
 msgstr "[Host oculto]"
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr "[Suspendido]"
 
@@ -11000,6 +11009,6 @@ msgstr "{canal | nick}"
 msgid "{nick | channel}"
 msgstr "{nick | canal}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 msgid "{nick | channel} memo-text"
 msgstr "{nick | canal} texto-del-memo"
diff --git a/language/anope.fr_FR.po b/language/anope.fr_FR.po
index 8a6b47099..97d86d913 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2013-12-29 23:48+0100\n"
 "Last-Translator: Harakiri <harakiri@overstack.fr>\n"
 "Language-Team: French\n"
@@ -58,7 +58,7 @@ msgstr "%s ajouté à la liste des mots interdits de %s."
 msgid "%s added to %s's access list."
 msgstr "%s ajouté à la liste d'accès de %s."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s ajouté à la liste des certificats de %s."
@@ -78,11 +78,6 @@ msgstr "%s ajouté à la liste des %s."
 msgid "%s added to the AKILL list."
 msgstr "%s ajouté à la liste d'AKILL."
 
-#: modules/commands/ns_cert.cpp:180
-#, c-format
-msgid "%s added to your certificate list."
-msgstr "%s ajouté à votre liste de certificats."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -121,7 +116,7 @@ msgstr ""
 "%s%s commande. Pour plus d'informations sur\n"
 "une commande spécifique, tapez %s%s %s commande.\n"
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -138,7 +133,7 @@ msgstr ""
 "d'informations sur une certaine commande, tapez\n"
 "%s%s %s commande.\n"
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -229,7 +224,7 @@ msgstr "%s supprimé de la liste des mots interdits de %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s supprimé de la liste d'accès de %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s supprimé de la liste de certificats de %s."
@@ -249,11 +244,6 @@ msgstr "%s supprimé de la liste %s."
 msgid "%s deleted from the AKILL list."
 msgstr "%s supprimé de la liste d'AKILL."
 
-#: modules/commands/ns_cert.cpp:209
-#, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s supprimé de votre liste de certificats."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -337,7 +327,7 @@ msgstr "%s ajouté à votre liste d'ignore."
 msgid "%s is already suspended."
 msgstr "%s est déjà suspendu."
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s n'est pas un nick ou canal enregistré non-interdit."
@@ -406,7 +396,7 @@ msgstr "%s correspond à l'entrée d'auto kick %s (%s)"
 msgid "%s not found on %s %s list."
 msgstr "%s introuvable sur la liste des %s %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s introuvable sur la liste d'accès de %s."
@@ -426,7 +416,7 @@ msgstr "%s introuvable sur la liste des mots interdits de %s."
 msgid "%s not found on %s's access list."
 msgstr "%s introuvable sur la liste d'accès de %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s introuvable dans la liste de certificats de %s."
@@ -584,6 +574,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "cible motdepasse"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr "adresse"
@@ -592,11 +587,11 @@ msgstr "adresse"
 msgid "botname {ON|OFF}"
 msgstr "nom-du-bot {ON|OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "canal"
 
@@ -620,8 +615,8 @@ msgstr "canal masque [raison]"
 msgid "channel modes"
 msgstr "canal modes"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "canal pseudo"
 
@@ -657,7 +652,7 @@ msgstr "canal ADD masque"
 msgid "channel ADD mask level"
 msgstr "canal ADD masque niveau"
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 msgid "channel ADD message"
 msgstr "canal ADD message"
 
@@ -673,9 +668,9 @@ msgstr "canal ADD {pseudo | masque} [raison]"
 msgid "channel APPEND topic"
 msgstr "canal APPEND sujet"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr "canal CLEAR"
 
@@ -687,11 +682,11 @@ msgstr "canal CLEAR [quoi]"
 msgid "channel CLEAR [ALL]"
 msgstr "canal CLEAR [ALL]"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 msgid "channel DEL num"
 msgstr "canal DEL num"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "canal DEL {masque | numero-entrée | liste}"
 
@@ -707,7 +702,7 @@ msgstr "canal DEL {mot | numéro-entrée | liste}"
 msgid "channel ENFORCE"
 msgstr "canal ENFORCE"
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr "canal LIST"
 
@@ -715,8 +710,8 @@ msgstr "canal LIST"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "canal LIST [masque | numéro-entrée | liste]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr "canal LIST [masque | liste]"
 
@@ -756,11 +751,11 @@ msgstr "canal VIEW [masque | numéro-entrée | liste]"
 msgid "channel VIEW [mask | list]"
 msgstr "canal VIEW [masque | liste]"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "canal [description]"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "canal [description]"
 
@@ -784,8 +779,8 @@ msgstr "canal [+expiration] {pseudo | masque} [raison]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "canal [UNLOCK|LOCK]"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 msgid "channel {ON|OFF}"
 msgstr "canal {ON|OFF}"
 
@@ -816,13 +811,13 @@ msgstr "canal {DIS | DISABLE} type"
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "canal {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "canal XOP {ON | OFF}"
 
@@ -830,7 +825,7 @@ msgstr "canal XOP {ON | OFF}"
 msgid "email"
 msgstr "email"
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 msgid "language"
 msgstr "langue"
 
@@ -842,8 +837,8 @@ msgstr "texte-mémo"
 msgid "message"
 msgstr "message"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr "nom-module"
 
@@ -855,10 +850,10 @@ msgstr "nouvel-affichage"
 msgid "new-password"
 msgstr "nouveau-motdepasse"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr "pseudo"
 
@@ -882,12 +877,12 @@ msgstr "pseudo nouveau-pseudo "
 msgid "nick [reason]"
 msgstr "pseudo [raison]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "pseudo"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 msgid "nickname address"
 msgstr "pseudo adresse"
 
@@ -895,7 +890,7 @@ msgstr "pseudo adresse"
 msgid "nickname email"
 msgstr "pseudo email"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 msgid "nickname language"
 msgstr "pseudo langue"
 
@@ -927,14 +922,14 @@ msgstr "pseudo [+expiration] [raison]"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "pseudo {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "pseudo {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "pseudo {ON | QUICK | IMMED | OFF}"
 
@@ -990,10 +985,6 @@ msgstr "modèle [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "nom-du-serveur [raison]"
 
-#: modules/commands/ns_group.cpp:78
-msgid "target password"
-msgstr "cible motdepasse"
-
 #: modules/commands/os_mode.cpp:139
 msgid "user modes"
 msgstr "canal modes"
@@ -1002,7 +993,7 @@ msgstr "canal modes"
 msgid "user [reason]"
 msgstr "user [raison]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, c-format
 msgid ""
 " \n"
@@ -1083,7 +1074,7 @@ msgstr ""
 "celle par défaut. L'échéance par défaut pour les AKILLs peut \n"
 "être consultée par la commande STATS AKILL."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, c-format
 msgid ""
 " \n"
@@ -1226,7 +1217,7 @@ msgstr ""
 "plus d'informations sur les privilèges donnés sur des utilisateurs\n"
 "d'un autre canal.\n"
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -1552,7 +1543,7 @@ msgstr " Chargé à : %p"
 msgid " but %s mysteriously dematerialized."
 msgstr "mais %s mystérieusement dématérialisé."
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1608,7 +1599,7 @@ msgstr "%d bots disponibles."
 msgid "%d modules loaded."
 msgstr "%d modules chargés."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d pseudos dans le groupe."
@@ -1723,9 +1714,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "%s (minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "La liste d'accès de %s est vide."
@@ -1756,8 +1747,8 @@ msgstr "La liste des mots interdits de %s est vide."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s ne peut être successeur et propriétaire du canal %s."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Commandes %s:"
@@ -2032,7 +2023,7 @@ msgstr "la liste de JOIN automatiques de %s est vide."
 msgid "%s's auto join list:"
 msgstr "Liste d'auto JOIN de %s :"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, c-format
 msgid "%s's certificate list is empty."
 msgstr "Liste de certificats de %s vide."
@@ -2134,7 +2125,7 @@ msgstr "%s est actuellement connecté."
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2201,15 +2192,16 @@ msgstr "ADD [+expiration] masque limite raison"
 msgid "ADD [nickname] channel [key]"
 msgstr "ADD [pseudo] canal [clé]"
 
-#: modules/commands/ns_cert.cpp:251
-msgid "ADD [nickname] fingerprint"
-msgstr "ADD [pseudo] fingerprint"
-
 #: modules/commands/ns_access.cpp:102
 msgid "ADD [nickname] mask"
 msgstr "ADD [pseudo] masque"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "ADD [pseudo] fingerprint"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr "ADD [+expiration] masque raison"
 
@@ -2287,7 +2279,7 @@ msgid "Access levels for %s reset to defaults."
 msgstr ""
 "Les niveaux d'accès de %s ont été réinitialisés à leur valeur par défaut."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, c-format
 msgid "Access list for %s:"
 msgstr "Liste d'accès de %s :"
@@ -2425,7 +2417,7 @@ msgstr "Tous les mémos du canal %s ont été supprimés."
 msgid "All modes cleared on %s."
 msgstr "Tous les modes ont été retirés de %s."
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2460,12 +2452,12 @@ msgstr "Tous les paramètres de %s ont été clonés pour %s."
 msgid "All user modes on %s have been synced."
 msgstr "Tous les modes utilisateurs de %s ont été synchronisés."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, 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"
@@ -2893,7 +2885,7 @@ msgstr ""
 "\n"
 "Exemple :      MODIFY nickserv forcemail no"
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
 "the given user. With MSG set, Services will use messages,\n"
@@ -2903,7 +2895,7 @@ msgstr ""
 "le pseudo donné. Si cette option est activée, ils utiliseront des\n"
 "messages, sinon ils utiliseront des notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3057,11 +3049,11 @@ msgstr "Associe une adresse e-mail à votre pseudo"
 msgid "Associate oper info with a nick or channel"
 msgstr "Associe une info oper à un pseudo ou un canal"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 msgid "Associates the given E-mail address with the nickname."
 msgstr "Associe une adresse e-mail donnée à un pseudo"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
 "This address will be displayed whenever someone requests\n"
@@ -3071,7 +3063,7 @@ msgstr ""
 "sera affichée lorsque quelqu'un demandera des informations \n"
 "sur votre pseudo avec la commande INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3375,8 +3367,8 @@ msgstr "Le bot ne kickera plus le flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Le bot ne kickera plus les répétitions."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr "Par"
 
@@ -3414,7 +3406,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Le bot n'est pas sur le canal %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr ""
 "Impossible d'envoyer un e-mail maintenant, veuillez réessayez un peu\n"
@@ -3473,7 +3465,7 @@ msgstr ""
 "Provoque la mise à jour de toutes les bases de données dès\n"
 "que vous le demandez."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, c-format
 msgid "Certificate list for %s:"
 msgstr "Liste de certificats pour %s :"
@@ -3486,7 +3478,7 @@ msgstr "ChanServ est requis pour activer la persistance sur ce réseau."
 msgid "Change channel modes"
 msgstr "Modifie les modes des canaux"
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 msgid "Change the communication method of Services"
 msgstr "Change le mode de communication des Services"
 
@@ -3525,7 +3517,7 @@ msgstr ""
 "Change le propriétaire d'un canal. Le nouveau pseudo doit être\n"
 "enregistré."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
@@ -3537,7 +3529,7 @@ msgstr ""
 "commande qu'il a envoyé). langue doit être choisi\n"
 "dans la liste suivante des langues supportées :"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
@@ -3575,7 +3567,7 @@ msgstr ""
 "enregistré, le successeur deviendra le nouveau propriétaire du\n"
 "canal. Le nouveau nick doit être enregistré."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 msgid "Channel"
 msgstr "Canal"
 
@@ -3659,7 +3651,7 @@ msgstr "Le canal %s n'expirera pas."
 msgid "Channel %s %s list has been cleared."
 msgstr "La liste %s %s est maintenant vide."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La liste d'accès de %s est maintenant vide."
@@ -3693,8 +3685,8 @@ msgstr "Liste des canaux :"
 msgid "Channel stats for %s on %s:"
 msgstr "Ststistiques de canal pour %s sur %s :"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 msgid "Channels may not be on access lists."
 msgstr "Des canaux peuvent ne pas être dans la liste d'accès."
 
@@ -3853,7 +3845,7 @@ msgstr "Confirme une inscription à NickServ"
 msgid "Control modes and mode locks on a channel"
 msgstr "Controle les mode et les modes forcés sur un canal"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -3876,20 +3868,20 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Copie tous les paramètres d'un canal à un autre"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 msgid "Created"
 msgstr "Créé"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 msgid "Creator"
 msgstr "Créateur"
 
@@ -3942,7 +3934,7 @@ msgstr "DEL cible info"
 msgid "DEL [nickname] channel"
 msgstr "DEL [pseudo] canal"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 msgid "DEL [nickname] fingerprint"
 msgstr "DEL [pseudo] fingerprint"
 
@@ -3950,8 +3942,8 @@ msgstr "DEL [pseudo] fingerprint"
 msgid "DEL [nickname] mask"
 msgstr "DEL [pseudo] masque"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL {masque | num | liste | id}"
 
@@ -4260,8 +4252,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr "Retiré de la pool %s."
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 msgid "Description"
 msgstr "Description"
 
@@ -4414,12 +4406,12 @@ msgstr ""
 "de\n"
 "ce pseudo."
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, 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/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "L'adresse E-mail pour %s a été effacée."
@@ -4486,7 +4478,7 @@ msgstr "Active les commandes fantaisistes"
 msgid "Enable greet messages"
 msgstr "Active les messages d'accueil"
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr "Active ou désactive le maintien des modes"
 
@@ -4516,7 +4508,7 @@ msgstr ""
 "paramétrés sur le canal et tentera de les redéfinir la prochaine fois que le "
 "canal sera créé."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
@@ -4527,7 +4519,7 @@ msgstr ""
 "utilisateurs\n"
 "et tenteront de les redéfinir la prochaine fois qu'ils "
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -4716,7 +4708,7 @@ msgstr "Fin de la liste des channels."
 msgid "End of configuration."
 msgstr "Fin de configuration."
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 msgid "End of entry message list."
 msgstr "Fin de la liste de messages d'entrée."
 
@@ -4734,7 +4726,7 @@ msgstr "Fin de la liste des interdits."
 msgid "End of list - %d channels shown."
 msgstr "Fin de la liste - %d canaux affichés."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fin de la liste - %d/%d correspondances affichées."
@@ -4784,37 +4776,37 @@ msgstr ""
 "jusqu'à ce que leur nombre ne dépasse plus la limite du canal, si elle est "
 "définie."
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Français"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Le message d'accueil %i de %s a été effacé."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Le message d'entrée %s n'a pas été trouvé sur le canal %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, c-format
 msgid "Entry message added to %s"
 msgstr "Le message d'accueil a été changé en %s"
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, c-format
 msgid "Entry message list for %s is empty."
 msgstr "La liste de messages d'entrée de %s est vide."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, c-format
 msgid "Entry message list for %s:"
 msgstr "Liste d'accès de %s :"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Tous les messages d'entrée du canal %s ont été supprimés."
@@ -4842,7 +4834,7 @@ msgstr ""
 "Erreur ! Le vHost est trop long, merci d'utiliser un hostname plus court que "
 "%d caractères."
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -4879,12 +4871,12 @@ msgstr "L'exception pour %s (#%d) a été déplacée à la position %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "L'exception pour %s a été changée en %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 msgid "Expires"
 msgstr "Expire"
 
@@ -4898,7 +4890,7 @@ msgstr "Expire et raison mise à jour pour %s."
 msgid "Expiry for %s updated."
 msgstr "L'expiration de %s a été changée."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantaisie"
 
@@ -4916,11 +4908,16 @@ msgstr "La fantaisie est maintenant activée sur le canal %s."
 msgid "Find a user's status on a channel"
 msgstr "Trouve le statut d'un utilisateur sur un canal"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "Le fingerprint %s existe déjà dans la liste de certificats de %s."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "%s est déjà dans %s."
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr "Flags"
@@ -5140,11 +5137,11 @@ msgstr "La liste des ignorés est vide."
 msgid "Ignore list:"
 msgstr "Liste des ignores :"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 msgid "Immediate protection"
 msgstr "Protection immediate"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 msgid "Incorrect email address."
 msgstr "Adresse e-mail incorrecte."
 
@@ -5230,16 +5227,16 @@ msgstr "Kicker d'italique"
 msgid "Join a group"
 msgstr "Joint un groupe"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 msgid "Keep modes"
 msgstr "Maintien des modes"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Le maintien des modes pour %s est maintenant inactif."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Le maintien des modes pour %s est maintenant actif."
@@ -5257,7 +5254,7 @@ msgstr "La clé du canal %s est %s."
 msgid "Kick a user from a channel"
 msgstr "Expulse un utilisateur d'un canal"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr "A kické %d/%d utilisateurs correspondant à %s sur %s."
@@ -5295,8 +5292,8 @@ msgstr "LIMIT forcé sur %s, %d utilisateurs supprimés."
 msgid "LIST threshold"
 msgstr "LIST numero"
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr "LIST [masque | liste | id]"
 
@@ -5304,8 +5301,8 @@ msgstr "LIST [masque | liste | id]"
 msgid "LIST [mask | list]"
 msgstr "LIST [masque] [liste]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 msgid "LIST [nickname]"
 msgstr "LIST [pseudo]"
 
@@ -5313,7 +5310,7 @@ msgstr "LIST [pseudo]"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texte|nombre]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Votre langue est maintenant le Français."
 
@@ -5326,7 +5323,7 @@ msgstr "Le dernier mémo envoyé à %s a été supprimé."
 msgid "Last quit message"
 msgstr "Dernier message de quit"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 msgid "Last seen"
 msgstr "Dernière connexion"
 
@@ -5338,7 +5335,7 @@ msgstr "Dernière adresse vue"
 msgid "Last topic"
 msgstr "Dernier topic"
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 msgid "Last used"
 msgstr "Utilisé dernièrement"
 
@@ -5366,8 +5363,8 @@ msgstr "Level pour %s sur le canal %s modifié en \"propriétaire seulement\"."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Le niveau doit être compris entre %d et %d inclus."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr "Limite"
 
@@ -5388,17 +5385,17 @@ msgstr "La liste pour le mode %c est pleine."
 msgid "List loaded modules"
 msgstr "Liste les modules chargés"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Liste des entrées correspondantes à %s :"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Liste des pseudos dans le groupe de %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Liste des pseudos dans votre groupe:"
 
@@ -5451,7 +5448,7 @@ msgstr ""
 "préfixés d'un point d'exclamation. Le paramètre pseudo est\n"
 "restreint aux Opérateurs des services."
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 msgid "Lists all nicknames in your group"
 msgstr "Liste des pseudos dans votre groupe :"
 
@@ -5951,7 +5948,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Gère les zones DNS pour ce réseau"
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 msgid "Manage the channel's entry messages"
 msgstr "Gère les message d'entrée du canal"
 
@@ -5980,15 +5977,15 @@ msgstr "Active/Désactive DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "Change le sujet sur un canal spécifié"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr "Masque"
 
@@ -6001,8 +5998,8 @@ msgstr "Le masque %s existe déjà dans la liste d'accès de %s."
 msgid "Mask must be in the form user@host."
 msgstr "Le masque doit être suos la forme user@host."
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 msgid "Masks and unregistered users may not be on access lists."
 msgstr ""
 "Les masques et les utilsiateurs non enregistrés ne peuvent pas être dans la "
@@ -6052,7 +6049,7 @@ msgstr "Limite de mémos de %s définie à %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de mémos de %s définie à 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Mémo envoyé à %s."
@@ -6062,11 +6059,11 @@ msgstr "Mémo envoyé à %s."
 msgid "Memos for %s:"
 msgstr "Mémos pour %s :"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 msgid "Message"
 msgstr "Message"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Mode message"
 
@@ -6142,7 +6139,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Affiche votre liste d'accès."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6172,11 +6169,11 @@ msgstr "Modifie la liste des utilisateurs %s"
 msgid "Modify the list of authorized addresses"
 msgstr "Modifie la liste des adresses autorisées"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 msgid "Modify the list of privileged users"
 msgstr "Modifie la liste des utilisateurs privilégiés"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 msgid "Modify the nickname client certificate list"
 msgstr "Modifie la liste de certificats du pseudo."
 
@@ -6229,10 +6226,10 @@ msgstr "Module  : %s Version: %s Auteur : %s chargé : %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr "Nom"
 
@@ -6249,9 +6246,9 @@ msgstr "Statistiques de réseau pour %s :"
 msgid "Never"
 msgstr "Jamais"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 msgid "Nick"
 msgstr "Pseudo"
 
@@ -6315,12 +6312,12 @@ msgstr "Le pseudo %s n'est pas enregistré."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Le pseudo %s a été tronqué de %d caractères."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Le pseudo %s expirera."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Le pseudo %s n'expirera pas."
@@ -6335,7 +6332,7 @@ msgstr "Le pseudo %s n'a aucun mémo de votre part."
 msgid "Nick %s has been logged out."
 msgstr "Le pseudo %s n'est plus identifié."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Le pseudo %s a été retiré du groupe %s."
@@ -6345,7 +6342,7 @@ msgstr "Le pseudo %s a été retiré du groupe %s."
 msgid "Nick %s is currently suspended."
 msgstr "Le pseudo %s est actuellement suspendu."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, c-format
 msgid "Nick %s is not in your group."
 msgstr "Le pseudo %s n'est pas dans votre groupe."
@@ -6385,17 +6382,17 @@ msgstr "Le pseudo %s est déjà enregistré !"
 msgid "Nickname %s may not be registered."
 msgstr "Le pseudo %s ne peut pas être enregistré."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Le pseudo %s est maintenant enregistré sous votre masque : %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, c-format
 msgid "Nickname %s registered."
 msgstr "Le pseudo %s est enregistré."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 msgid "No auto-op"
 msgstr "Pas d'auto-op"
 
@@ -6403,7 +6400,7 @@ msgstr "Pas d'auto-op"
 msgid "No bot"
 msgstr "Pas de bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 msgid "No expire"
 msgstr "N'expire pas"
 
@@ -6436,8 +6433,8 @@ msgstr "Aucune correspondance pour %s trouvée."
 msgid "No matching entries on %s %s list."
 msgstr "Aucune entrée correspondante sur la liste %s %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Aucune entrée correspondante sur la liste d'accès de %s."
@@ -6511,8 +6508,8 @@ msgstr "Pas de requête trouvée pour %s."
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Pas de kick signés lorsque SIGNKICK LEVEL est utilisé."
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, c-format
 msgid "No stats for %s."
 msgstr "Aucune statistique pour %s."
@@ -6522,7 +6519,7 @@ msgstr "Aucune statistique pour %s."
 msgid "No such info \"%s\" on %s."
 msgstr "Aucune informations \"%s\" sur %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, c-format
 msgid "No users on %s match %s."
 msgstr "Aucun utilisateur sur %s ne correspond à %s."
@@ -6550,17 +6547,17 @@ msgstr "Aucune"
 msgid "Nothing to do."
 msgstr "Rien à faire."
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr "Nombre"
 
@@ -6681,12 +6678,12 @@ msgstr "Le mot de passe de %s est %s."
 msgid "Password incorrect."
 msgstr "Mot de passe incorrect."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Un email de réinitialisation de mot de passe pour %s a été envoyé."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Paix"
 
@@ -6700,7 +6697,7 @@ msgstr "Le mode 'paix' est INACTIF pour %s."
 msgid "Peace option for %s is now on."
 msgstr "Le mode 'paix' est ACTIF pour %s."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 msgid "Persistent"
 msgstr "Persistant"
 
@@ -6740,18 +6737,18 @@ msgstr "Attendez %d secondes et réessayez."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Veuillez patienter %d secondes avant de redemander un nouveau vHost."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
 "Veuillez patienter %d secondes avant d'utiliser la commande %s à nouveau."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -6793,7 +6790,7 @@ msgstr "Empêche le canal d'expirer"
 msgid "Prevent the nickname from appearing in the LIST command"
 msgstr "Empêche le pseudo d'apparaître dans une commande LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 msgid "Prevent the nickname from expiring"
 msgstr "Empêche le pseudo d'expirer"
 
@@ -6801,8 +6798,8 @@ msgstr "Empêche le pseudo d'expirer"
 msgid "Prevents users being kicked by Services"
 msgstr "Empêche des utilisateurs d'êter kickés par les services"
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Confidentialité"
 
@@ -6846,26 +6843,26 @@ msgstr "Privilège %s ajouté à %s sur %s, les nouveaux flags sont +%s"
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr "Privilège %s supprimé à %s sur %s, les nouveaux flags sont +%s"
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Protection"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, c-format
 msgid "Protection is now off for %s."
 msgstr "La protection est maintenant INACTIVE pour %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, c-format
 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "La protection est maintenant ACTIVE pour %s, sans aucun délai."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, c-format
 msgid "Protection is now on for %s."
 msgstr "La protection est maintenant ACTIVE pour %s."
@@ -6880,7 +6877,7 @@ msgstr ""
 "spécifié. Ceci utilise le réel identd@host de tous les pseudos\n"
 "et force le AKILL. "
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 msgid "Quick protection"
 msgstr "Protection rapide"
 
@@ -6922,11 +6919,11 @@ msgstr "Lit un ou des mémos"
 msgid "Real name"
 msgstr "    Vrai nom : %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr "Motif"
 
@@ -6958,13 +6955,13 @@ msgstr "Redéfinit la signification des niveaux d'accès"
 msgid "Regains control of your nick"
 msgstr "Reprendre le contrôle de votre pseudo"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 msgid "Regex is disabled."
 msgstr "Regex est activé"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -6974,8 +6971,8 @@ msgstr ""
 "le moteur %s. Mettez votre masque entre // si vous désirez l'utiliser."
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7047,7 +7044,7 @@ msgstr ""
 "%s donnera également automatiquement les privilèges de propriétaire et\n"
 "d'opérateur du canal lorsqu'il joindra le canal."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7125,7 +7122,7 @@ msgstr "Recharge un module"
 msgid "Reload services' configuration file"
 msgstr "Recharge le fichier de configuration des Services"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 msgid "Remove a nick from a group"
 msgstr "Supprime un pseudo d'un groupe"
 
@@ -7206,7 +7203,7 @@ msgstr ""
 "les administrateurs du réseau. Merci d'être patient pendant que votre\n"
 "requête est prise en compte."
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "Recharge le fichier de configuration des Services"
@@ -7215,7 +7212,7 @@ msgstr "Recharge le fichier de configuration des Services"
 msgid "Restrict access to the channel"
 msgstr "Restreindre l'accès au canal"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 msgid "Restricted access"
 msgstr "Accès restreint"
 
@@ -7342,13 +7339,13 @@ msgstr "SET serveur"
 msgid "SET server.name option value"
 msgstr "SET nom.du.serveur option valeur"
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr ""
 "Fingerprint de certificat SSL accepté - vous êtes maintenant identifié."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr ""
 "Fingerprint de certificat SSL accepté - vous êtes maintenant identifié."
@@ -7370,7 +7367,7 @@ msgstr "Sauvegarde les bases de données et relance les services."
 msgid "Searches logs for a matching pattern"
 msgstr "Recherche les correspondances au modèle dans le fichier de logs."
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 msgid "Secure founder"
 msgstr "Sécurité du propriétaire"
 
@@ -7384,7 +7381,7 @@ msgstr "L'option de sécurité du propriétaire pour %s est INACTIVE."
 msgid "Secure founder option for %s is now on."
 msgstr "L'option de sécurité du propriétaire pour %s est ACTIVE."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 msgid "Secure ops"
 msgstr "Sécurité des OPs"
 
@@ -7408,12 +7405,12 @@ msgstr "L'option de sécurité pour %s est INACTIVE."
 msgid "Secure option for %s is now on."
 msgstr "L'option de sécurité pour %s est ACTIVE."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, c-format
 msgid "Secure option is now off for %s."
 msgstr "L'option de sécurité est maintenant INACTIVE pour %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, c-format
 msgid "Secure option is now on for %s."
 msgstr "L'option de sécurité est maintenant ACTIVE pour %s."
@@ -7423,7 +7420,7 @@ msgstr "L'option de sécurité est maintenant ACTIVE pour %s."
 msgid "Secureops enforced on %s."
 msgstr "La sécurité pour les opérateurs est maintenant renforcée pour %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Sécurité"
 
@@ -7469,7 +7466,7 @@ msgstr "Expéditeur"
 msgid "Sends a memo and requests a read receipt"
 msgstr "Envoie un memo et demande un accusé de reception"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
 "reset their password.  Email must be the email address associated\n"
@@ -7703,12 +7700,12 @@ msgid "Services will now automatically give modes to users in %s."
 msgstr ""
 "Les services appliqueront automatiquement des modes utilisateurs sur %s."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Les services repondront à %s par des messages."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Les services repondront à %s par des notices."
@@ -7771,7 +7768,7 @@ msgstr "Change l'affichage de votre groupe dans les services"
 msgid "Set the founder of a channel"
 msgstr "Définit le propriétaire d'un canal"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 msgid "Set the language Services will use when messaging you"
 msgstr ""
 "Change la langue dans laquelle les Services vous envoient leurs messages"
@@ -8142,7 +8139,7 @@ msgstr ""
 "sur les canaux. Notez que selon les paramètres du canal\n"
 "certains modes pourraient ne pas être appliqués automatiquement."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
@@ -8224,11 +8221,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Les kicks seront maintenant signés sur %s."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Kicks signés"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "Désolé, %s a trop de mémos et ne peut en recevoir plus."
@@ -8242,12 +8239,12 @@ msgstr "Désolé, je n'ai pas vu %s."
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Désolé, l'assignation du bot est temporairement désactivée."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Désolé, la modification des bots est temporairement désactivée."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Désolé, la configuration des options du bot est \n"
@@ -8261,7 +8258,7 @@ msgstr ""
 "Désolé, la modification des listes %s des canaux est temporairement "
 "désactivée."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Désolé, la modification des listes d'accès des canaux est temporairement "
@@ -8305,7 +8302,7 @@ msgstr "Désolé, l'envoi de mémo est temporairement désactivé."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Désolé, l'effacement de pseudo est temporairement désactivé."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Désolé, le groupage de pseudos est temporairement désactivé."
 
@@ -8323,14 +8320,14 @@ msgstr "Désolé, vous ne pouvez avoir que %d entrées sur la liste d'accès."
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr "Désolé, le nombre maximal de %d auto join a été atteint."
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr ""
 "Désolé, le nombre maximal de %d d'entrée de certificats a été atteinte."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8467,7 +8464,7 @@ msgstr ""
 "modes\n"
 "qu'ils doivent avoir en se basant sur leurs accès."
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "Synchronise tous les nicks d'un groupe"
 
@@ -8475,7 +8472,7 @@ msgstr "Synchronise tous les nicks d'un groupe"
 msgid "Syntax"
 msgstr "Syntaxe "
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8486,7 +8483,7 @@ msgstr ""
 "\n"
 "Liste tous les pseudos dans votre groupe."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -8719,7 +8716,7 @@ msgstr ""
 "mot de passe est celui que vous avez donné avec la commande \n"
 "REGISTER."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -8913,7 +8910,7 @@ msgstr ""
 "\n"
 "La commande CLEAR vide les entrées de la liste de badwords."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
@@ -8923,7 +8920,7 @@ msgstr ""
 "à la liste des messages à montrer aux utilisateurs lorsqu'ils joignent\n"
 "le canal."
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8934,7 +8931,7 @@ msgstr ""
 "canal\n"
 "en désactivant ces messages."
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8946,7 +8943,7 @@ msgstr ""
 "Vous pouvez supprimer le message en spécifiant son numéro, que vous pouvez\n"
 "obtenir en listant les messages, comme c'est expliqué ci-dessous."
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
@@ -8954,7 +8951,7 @@ msgstr ""
 "La commande ENTRYMSG LIST affiche une liste de messages qui sera\n"
 "montrée aux utilisateurs lorsqu'ils joignent le canal."
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "L'option IMMED n'est pas disponible sur ce réseau."
 
@@ -9053,7 +9050,7 @@ msgstr ""
 "La commande STATS affiche des statistiques à propos des pseudo stockés et de "
 "la mémoire utilisée."
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 msgid ""
 "The email parameter is optional and will set the email\n"
 "for your nick immediately.\n"
@@ -9154,7 +9151,17 @@ msgstr ""
 "Le système defcon utilise et applique des configurations\n"
 "pré-definies pour protéger durant une attaque sur le réseau."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr "L'adresse e-mail donnée a atteint la limite de %d utilisateurs."
+
+#: modules/ns_maxemail.cpp:28
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr "L'adresse e-mail donnée a atteint la limite d'un seul utilisateur."
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, c-format
 msgid "The entry message list for %s is full."
 msgstr "Le message d'accueil de %s est plein."
@@ -9163,15 +9170,6 @@ msgstr "Le message d'accueil de %s est plein."
 msgid "The following feature/function names are available:"
 msgstr "Les fonctionnalités suivantes sont disponibles :"
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr "L'adresse e-mail donnée a atteint la limite de %d utilisateurs."
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "L'adresse e-mail donnée a atteint la limite d'un seul utilisateur."
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9320,7 +9318,7 @@ msgstr "Il n'y a pas de serveurs configurés."
 msgid "There are no forbids of type %s."
 msgstr "Il n'y a pas d'interdits de type %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 msgid "There are too many nicks in your group."
 msgstr "Il y a trop de nicks dans votre groupe."
 
@@ -9433,7 +9431,7 @@ msgstr ""
 "Les commandes POOL et DEPOOL ajoutent et suppriment des serveurs dans\n"
 "les zones données."
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 msgid ""
 "This command allows users to set the vhost of their\n"
 "CURRENT nick to be the vhost for all nicks in the same\n"
@@ -9442,7 +9440,7 @@ msgstr ""
 "Permet d'enregistrer le vHost du pseudo actuellement\n"
 "utilisé pour tous les pseudos du groupe. "
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9510,7 +9508,7 @@ msgstr ""
 "répertoire\n"
 "des modules."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 msgid ""
 "This command makes your nickname join the target nickname's\n"
 "group. password is the password of the target nickname.\n"
@@ -9577,7 +9575,7 @@ msgstr ""
 "Les Opérateurs des services peuvent fournir un pseudo pour modifier\n"
 "la liste d'auto join d'autres utilisateurs."
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -9634,7 +9632,7 @@ msgstr ""
 "de cette commande est limitée aux utilisateurs qui ont la possibilité\n"
 "de modifier les accès du canal."
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
@@ -9652,7 +9650,7 @@ msgstr ""
 msgid "This command unloads the module named modname."
 msgstr "Cette commande dé-charge le module nommé nom-module."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -9779,11 +9777,11 @@ msgstr "Cessez d'utiliser tant de majuscules!"
 msgid "Turn chanstats statistics on or off"
 msgstr "Active ou désactive le chanstats."
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 msgid "Turn nickname security on or off"
 msgstr "Active ou désactive la sécurité du pseudo"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 msgid "Turn protection on or off"
 msgstr "Active ou désactive la protection"
 
@@ -9819,7 +9817,7 @@ msgstr ""
 "tout de même avoir des informations en utilisant\n"
 "la commande INFO)."
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -9847,7 +9845,7 @@ msgstr ""
 "Active ou désactive les statistiques de canaux chanstats pour cet "
 "utilisateur."
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -9875,7 +9873,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/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -9950,7 +9948,7 @@ msgstr ""
 "Tapez %s%s HELP %s option pour plus d'informations sur\n"
 "une option particulière."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -9965,8 +9963,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "Décharge un module"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Impossible de trouver le moteur de regex %s."
@@ -10179,8 +10177,8 @@ msgstr "Le vhost pour le groupe %s enregistré en %s@%s."
 msgid "VIEW host"
 msgstr "VIEW host"
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 msgid "VIEW [mask | list | id]"
 msgstr "VIEW [masque | liste | id]"
 
@@ -10321,12 +10319,12 @@ msgstr ""
 msgid "Word"
 msgstr "Mot"
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Vous êtes déjà membre du groupe de %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Vous êtes déjà identifié."
 
@@ -10351,6 +10349,11 @@ msgstr "Vous n'êtes pas autorisé à être sur ce canal."
 msgid "You are not permitted to change your memo limit."
 msgstr "Vous n'êtes pas autorisé à changer votre limite de mémos."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Vous n'êtes pas identifié."
+
 #: modules/commands/os_set.cpp:85
 msgid "You are now a super admin."
 msgstr "Vous êtes maintenant SuperAdmin."
@@ -10359,7 +10362,7 @@ msgstr "Vous êtes maintenant SuperAdmin."
 msgid "You are now an IRC Operator."
 msgstr "Vous êtes maintenant IRCOp."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
 "Vous êtes maintenant identifié pour votre nick. Changez votre mot de passe "
@@ -10428,8 +10431,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Vous ne pouvez pas utiliser %s sur vous-même !"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 msgid "You can't add a channel to its own access list."
 msgstr "Vous ne pouvez pas ajouter de canal dans votre propre liste d'accès."
 
@@ -10439,7 +10442,7 @@ msgid "You can't logout %s, they are a Services Operator."
 msgstr ""
 "Vous ne pouvez pas déconnecter %s parce que c'est un opérateur des services."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, c-format
 msgid "You cannot %s on this network."
 msgstr "Vous ne pouvez pas %s sur ce réseau."
@@ -10454,7 +10457,7 @@ msgstr "Vous ne pouvez mettre la limite de mémos de %s à plus de %d."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Vous ne pouvez mettre votre limite de mémos à plus de %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Vous ne pouvez pas effacer votre e-mail sur ce réseau."
 
@@ -10527,7 +10530,12 @@ msgstr ""
 "Vous avez un nouveau mémo de %s,\n"
 "Tapez %s%s READ %d pour le lire."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Vous avez été invité à rejoindre %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Vous avez été invité à rejoindre %s."
@@ -10583,11 +10591,17 @@ msgstr "Vous pouvez supprimer n'importe quel nick de votre groupe."
 msgid "You may not (un)lock mode %c."
 msgstr "Vous ne pouvez pas (dé)bloquer le mode %c."
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 msgid "You may not change the e-mail of other Services Operators."
 msgstr ""
 "Vous ne pouvez pas changer l'adresse e-mail d'autres Services Operators."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr ""
+"Vous ne pouvez pas changer l'adresse e-mail d'autres Services Operators."
+
 #: modules/commands/ns_set.cpp:191
 msgid "You may not change the password of other Services Operators."
 msgstr ""
@@ -10615,7 +10629,7 @@ msgstr ""
 "Vous pouvez voir mais pas modifier la liste d'accès d'autres Services "
 "Operators."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
 msgstr ""
@@ -10649,7 +10663,7 @@ msgstr ""
 "Vous devez entrer le nom du canal deux fois pour confirmer que vous voulez "
 "effacer %s."
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -10662,7 +10676,7 @@ msgstr ""
 "Vous devez avoir le %s(ME) privilege sur le canal pour utiliser cette "
 "commande."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -10672,10 +10686,6 @@ msgstr ""
 "Cet e-mail vous permettra de retrouver votre mot de passe\n"
 "au cas où vous le perdriez."
 
-#: modules/commands/ns_register.cpp:135
-msgid "You must specify an email address."
-msgstr "Vous devez spécifier une adresse e-mail."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "Vous devez être identifié pour utiliser cette commande."
@@ -10737,16 +10747,16 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Votre compte %s a été créé avec succès."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 msgid "Your account is already confirmed."
 msgstr "Votre compte est déjà confirmé."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "En cas de non confirmation, votre compte expirera dans %s"
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Votre adresse E-mail a été changée en %s."
@@ -10755,7 +10765,7 @@ msgstr "Votre adresse E-mail a été changée en %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Votre adress e-mail n'est pas autorisée, merci d'en choisir une autre."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 #, fuzzy
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
@@ -10814,11 +10824,11 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Votre pseudo n'est plus identifié."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 msgid "Your nick is already registered."
 msgstr "Votre pseudo est déjà enregistré."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr ""
 "Votre pseudo n'est pas groupé à quoi que ce soit, vous ne pouvez pas le "
@@ -10828,7 +10838,7 @@ msgstr ""
 msgid "Your nick isn't registered."
 msgstr "Votre nick n'est pas enregistré."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Votre pseudo est maintenant changé en %s."
@@ -10837,12 +10847,12 @@ msgstr "Votre pseudo est maintenant changé en %s."
 msgid "Your oper block doesn't require logging in."
 msgstr "Votre bloc oper ne recquiert pas de s'authentifier."
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Votre mot de passe a été renvoyé à %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, 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."
@@ -10851,7 +10861,7 @@ msgstr "Votre mot de passe est %s - notez-le pour une utilisation ultérieure.
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr "Votre mot de passe est trop long. Merci d'en choisir un plus court."
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Votre demande de réinitialisation de mot de passe a expiré."
 
@@ -10958,7 +10968,7 @@ msgstr "[clé|#X-Y]"
 msgid "[nick | channel]"
 msgstr "{pseudo | canal}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 msgid "[nick]"
 msgstr "[pseudo]"
 
@@ -10966,8 +10976,8 @@ msgstr "[pseudo]"
 msgid "[nickname [REVALIDATE]]"
 msgstr "[pseudo [REVALIDATE]]"
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr "[pseudo]"
 
@@ -10987,7 +10997,7 @@ msgstr "[+expiration] {#canal} [raison]"
 msgid "[Hostname hidden]"
 msgstr "[Hostname caché]"
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr "[Suspendu]"
 
@@ -11149,6 +11159,6 @@ msgstr "{canal | pseudo}"
 msgid "{nick | channel}"
 msgstr "{pseudo | canal}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 msgid "{nick | channel} memo-text"
 msgstr "{pseudo | canal} texte-du-memo"
diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po
index 2ca564a04..a68082ca4 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 20:37-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Hungarian\n"
@@ -61,7 +61,7 @@ msgstr "A %s szó hozzáadva a %s tiltott szavak listájához."
 msgid "%s added to %s's access list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s hozzáadva a hozzáférési listádhoz."
@@ -81,11 +81,6 @@ msgstr "%s hozzáadva az AKILL listához."
 msgid "%s added to the AKILL list."
 msgstr "%s hozzáadva az AKILL listához."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "%s hozzáadva a hozzáférési listádhoz."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -116,7 +111,7 @@ msgstr ""
 "Bővebb információt így kaphatsz az adott parancsról:\n"
 "/msg %s HELP parancs."
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -133,7 +128,7 @@ msgstr ""
 "beírod, hogy: /msg %s parancs, lásd még a\n"
 "/msg %s HELP parancs."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -225,7 +220,7 @@ msgstr "A %s szó törölve %s tiltott szavak listájából."
 msgid "%s deleted from %s's access list."
 msgstr "%s törölve lett a (%s) csatorna hozzáférési listájáról."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s törölve a hozzáférési listádról."
@@ -245,11 +240,6 @@ msgstr "%s törölve lett a %s AOP listáról."
 msgid "%s deleted from the AKILL list."
 msgstr "%s törölve az AKILL listáról."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s törölve a hozzáférési listádról."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -333,7 +323,7 @@ msgstr "%s hozzáadva a hozzáférési listádhoz."
 msgid "%s is already suspended."
 msgstr "You are already in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s nem érvényes bot vagy regisztrált szoba."
@@ -400,7 +390,7 @@ msgstr "%s hozzáadva a (%s) csatorna autokick listájához"
 msgid "%s not found on %s %s list."
 msgstr "%s nem találatható a %s AOP listán."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, 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."
@@ -420,7 +410,7 @@ msgstr "A %s szó nem található a %s tiltott szavak listáján."
 msgid "%s not found on %s's access list."
 msgstr "%s nem található a (%s) csatorna hozzáférési listáján."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s nem található a hozzáférési listádon."
@@ -599,6 +589,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP célnick jelszó"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -608,11 +603,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP #szoba"
@@ -642,8 +637,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel modes"
 msgstr "MODE szoba mód"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN #szoba [nick]"
@@ -687,7 +682,7 @@ msgstr "MODE szoba mód"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE szoba mód"
@@ -706,9 +701,9 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel APPEND topic"
 msgstr "TOPIC #szoba [topic]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP #szoba"
@@ -723,12 +718,12 @@ msgstr "TOPIC #szoba [topic]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP #szoba"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE szoba mód"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [#szoba] { szám | list | ALL}"
@@ -747,7 +742,7 @@ msgstr "DEL [#szoba] { szám | list | ALL}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP #szoba"
@@ -757,8 +752,8 @@ msgstr "DROP #szoba"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
@@ -805,12 +800,12 @@ msgstr "AOP #szoba { ADD | DEL | LIST | CLEAR } [ nick | sorszám ]"
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [#szoba] { szám | list | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER #szoba leírás"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN #szoba [nick]"
@@ -840,8 +835,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP #szoba"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET #szoba XOP {ON | OFF}"
@@ -878,13 +873,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET #szoba SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET #szoba XOP {ON | OFF}"
@@ -893,7 +888,7 @@ msgstr "SET #szoba XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE szám"
@@ -908,8 +903,8 @@ msgstr "STAFF memo-text"
 msgid "message"
 msgstr "GLOBAL üzenet"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -922,10 +917,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP célnick jelszó"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO nick"
@@ -955,13 +950,13 @@ msgstr "SVSNICK nick újnick "
 msgid "nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK nicknév "
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID nicknév indok"
@@ -971,7 +966,7 @@ msgstr "FORBID nicknév indok"
 msgid "nickname email"
 msgstr "FORBID nicknév indok"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID nicknév indok"
@@ -1011,15 +1006,15 @@ msgstr "FORBID nicknév indok"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
@@ -1088,11 +1083,6 @@ msgstr "LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE szervernév [leírás]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP célnick jelszó"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1103,7 +1093,7 @@ msgstr "MODE szoba mód"
 msgid "user [reason]"
 msgstr "JUPE szervernév [leírás]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1239,7 +1229,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz operatornak."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1373,7 +1363,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1767,7 +1757,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1823,7 +1813,7 @@ msgstr "%d botok rendelkezésre állnak."
 msgid "%d modules loaded."
 msgstr "%d Modul betöltve."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nicknév van a csoportban."
@@ -1926,9 +1916,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "\tCaps Lockért kirúgás: %s (minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s hozzáférési listája üres."
@@ -1959,8 +1949,8 @@ msgstr "%s tiltott szavak listája üres."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s nem lehet a %s csatorna successora, mert ő a founder is."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "%s parancsok:"
@@ -2226,7 +2216,7 @@ msgstr "%s autokick listája üres."
 msgid "%s's auto join list:"
 msgstr "    AKICK      AutoKirúgás listára teheted a \"rossz\" usereket"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Your access list is empty."
@@ -2332,7 +2322,7 @@ msgstr "%s jelenleg online."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2400,17 +2390,17 @@ msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID nicknév indok"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID nicknév indok"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
@@ -2494,7 +2484,7 @@ msgstr "%s hozzáférési szintjeinek beállításai:"
 msgid "Access levels for %s reset to defaults."
 msgstr "%s szintjei visszaállítva az alapértékekre."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "%s hozzáférési listája:"
@@ -2632,7 +2622,7 @@ msgstr "Minden üzenetet töröltem a %s csatornán."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2665,12 +2655,12 @@ msgstr "Az összes user vhosztja a(z) %s csoportba %s lett"
 msgid "All user modes on %s have been synced."
 msgstr "Összes O:lines %s újra aktív."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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"
@@ -3119,7 +3109,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3132,7 +3122,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3296,12 +3286,12 @@ msgstr "    EMAIL      Egy E-mail cím társítása a nicknevedhez"
 msgid "Associate oper info with a nick or channel"
 msgstr "ASSIGN             Társít egy botot a csatornához"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      Egy E-mail cím társítása a nicknevedhez"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3314,7 +3304,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/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3623,8 +3613,8 @@ msgstr "A Bot nem fog kirúgni flood miatt."
 msgid "Bot won't kick for repeats anymore."
 msgstr "A Bot nem fog kirúgni ismétlés miatt."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3667,7 +3657,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "A Bot most már opot is kirúg a %s szobából."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nem lehet most levelet küldeni;  próbáld újra később."
 
@@ -3748,7 +3738,7 @@ msgstr ""
 "\n"
 "Korlátozva Szervíz adminoknak."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "%s hozzáférési listája:"
@@ -3762,7 +3752,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s váltóztatott a módodon."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr "    MSG        Megváltoztatja a szervízzel való kommunikációt"
@@ -3812,7 +3802,7 @@ msgstr ""
 "Megváltoztatja a szoba founderjét.\n"
 "Az új nicknév regisztrált kell hogy legyen!"
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3825,7 +3815,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/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3874,7 +3864,7 @@ msgstr ""
 "is ez történik, ha nem volt megadva successor.\n"
 "A nicknek regisztrálnak kell lennie."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP #szoba"
@@ -3959,7 +3949,7 @@ 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/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Channel %s access list has been cleared."
@@ -3996,8 +3986,8 @@ msgstr ""
 "Azon csatornák, ahol %s nicknek hozzáférése van:\n"
 "  Sorszám  Csatorna              Szint    Meghatározás"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s nem található a (%s) csatorna hozzáférési listáján."
@@ -4178,7 +4168,7 @@ msgstr "    CONFIRM    Confirm a nickserv auth code"
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  Törli a szoba módot"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4197,21 +4187,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "Született: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "Született: %s"
@@ -4270,7 +4260,7 @@ msgstr "GROUP célnick jelszó"
 msgid "DEL [nickname] channel"
 msgstr "MODE szoba mód"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID nicknév indok"
@@ -4280,8 +4270,8 @@ msgstr "FORBID nicknév indok"
 msgid "DEL [nickname] mask"
 msgstr "MODE szoba mód"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [#szoba] { szám | list | ALL}"
@@ -4606,8 +4596,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "%s csatorna leírás megváltoztatva: %s."
@@ -4770,12 +4760,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
@@ -4864,7 +4854,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4901,14 +4891,14 @@ 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/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5115,7 +5105,7 @@ msgstr "Vége a szoba listának."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Vége a felhasználó listának."
@@ -5135,7 +5125,7 @@ msgstr "Vége a felhasználó listának."
 msgid "End of list - %d channels shown."
 msgstr "Lista vége - %d / %d találat megjelenítve."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Lista vége - %d / %d találat megjelenítve."
@@ -5170,37 +5160,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Magyar"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Greet message for %s unset."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Fantasy mód most ON a %s csatornán."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Greet message for %s changed to %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "%s hozzáférési listája:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Minden üzenetet töröltem a %s csatornán."
@@ -5224,7 +5214,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5250,12 +5240,12 @@ msgstr "%s kivétel (#%d) áthelyezve a %d pozicíóba."
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "Expires in: %s"
@@ -5270,7 +5260,7 @@ msgstr "Exception for %s has been updated to %d."
 msgid "Expiry for %s updated."
 msgstr "Lejárati idő megváltozott: %s."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasy"
 
@@ -5289,11 +5279,16 @@ msgstr "Fantasy mód most ON a %s csatornán."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "You are already in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5527,12 +5522,12 @@ msgstr "Mellőzöttek lista üres."
 msgid "Ignore list:"
 msgstr "Botok listája:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Voices védelme"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "E-mail cím: %s"
@@ -5624,17 +5619,17 @@ msgstr "\tItalics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Csatlakozás egy csoporthoz"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Üzenet mód"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Peace option for %s is now ON."
@@ -5653,7 +5648,7 @@ msgstr "Key for channel %s is %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Kirúgja a felhasználót csatornáról"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5695,8 +5690,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [#szoba] [list | NEW ]"
@@ -5706,8 +5701,8 @@ msgstr "LIST [#szoba] [list | NEW ]"
 msgid "LIST [mask | list]"
 msgstr "LIST [#szoba] [list | NEW ]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK nicknév "
@@ -5716,7 +5711,7 @@ msgstr "CHECK nicknév "
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS { ADD | DEL | LIST } [szöveg|szám]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Új nyelvezet: Magyar."
 
@@ -5730,7 +5725,7 @@ msgstr "%s részére küldött utolsó memo üzenet visszavonva."
 msgid "Last quit message"
 msgstr "Utolsó kilépő üzenet: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "Utoljára ekkor volt: %s"
@@ -5744,7 +5739,7 @@ msgstr "Utoljára látott cím: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "Utoljára ekkor volt: %s"
@@ -5774,8 +5769,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "A szintnek kizárólag %d és %d között kell lennie."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5800,17 +5795,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     Listázza a betöltött modulokat"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "%s csoportjába tartozó nickek listája:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s csoportjába tartozó nickek listája:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "A csoportodba tartozó nickek listája:"
 
@@ -5867,7 +5862,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "A csoportodba tartozó nickek listája:"
@@ -6361,7 +6356,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6396,15 +6391,15 @@ msgstr "    DEFCON      Manipulálja a DefCon rendszert"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6417,8 +6412,8 @@ msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "Ez a maszk: %s már szerepel a hozzáférési listádon."
@@ -6470,7 +6465,7 @@ msgstr "%s maximálisan fogadható üzeneteinek száma: %d."
 msgid "Memo limit for %s set to 0."
 msgstr "%s ezentúl nem fogadhat üzeneteket."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Üzenet elküldve %s részére."
@@ -6480,12 +6475,12 @@ msgstr "Üzenet elküldve %s részére."
 msgid "Memos for %s:"
 msgstr "\tRögzített módok: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL üzenet"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Üzenet mód"
 
@@ -6567,7 +6562,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "          Megmutatja a hozzáférési listát."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6592,12 +6587,12 @@ msgstr "    AOP        AutoOperátor lista beállítása"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS     A hozzáférési lista módosítása"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS     A szoba hozzáférési listájának beállítása"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Módosítja a Szervíz mellőzési listáját"
@@ -6651,10 +6646,10 @@ msgstr "Modul: %s Verzió: %s Szerző: %s Betöltve: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Modul: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6671,9 +6666,9 @@ msgstr "%s hozzáférési listája:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO nick"
@@ -6738,12 +6733,12 @@ msgstr "Nickname %s registered."
 msgid "Nick %s was truncated to %d characters."
 msgstr "A nicked %s meg lett csonkítva %d karakter hosszúságúra."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
@@ -6758,7 +6753,7 @@ msgstr "%s nickre nem érkezett memo üzenet tőled."
 msgid "Nick %s has been logged out."
 msgstr " %s nick sikeresen kijelentkezett."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6768,7 +6763,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6808,17 +6803,17 @@ msgstr "A megadott csatorna %s már regisztrált!"
 msgid "Nickname %s may not be registered."
 msgstr "Ez a csatorna %s nem regisztrálható. "
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Ez a nicknév: %s számodra lett regisztrálva: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6827,7 +6822,7 @@ msgstr "Auto-op"
 msgid "No bot"
 msgstr "Nincs bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "nem fog elévülni"
@@ -6861,8 +6856,8 @@ msgstr "Nincs Email listázva ehhez: %s."
 msgid "No matching entries on %s %s list."
 msgstr "Nincs ilyen bejegyzés a %s AOP listán."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, 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."
@@ -6933,8 +6928,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "%s hozzáférési listája:"
@@ -6944,7 +6939,7 @@ msgstr "%s hozzáférési listája:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "%s usermódjai megváltoztatva."
@@ -6972,17 +6967,17 @@ msgstr "Nincs"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7108,12 +7103,12 @@ msgstr "%s jelszava: %s."
 msgid "Password incorrect."
 msgstr "Hibás jelszó."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Békesség"
 
@@ -7127,7 +7122,7 @@ msgstr "Peace option for %s is now ON."
 msgid "Peace option for %s is now on."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7163,17 +7158,17 @@ msgstr "Kérlek várj %d másodpercet és próbáld újra."
 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!"
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Kérlek, várj %d másodpercet mielőtt SEND parancsot újra használod!"
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, 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!"
@@ -7221,7 +7216,7 @@ msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
@@ -7230,8 +7225,8 @@ msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privát"
 
@@ -7275,26 +7270,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Kill védelem"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Protection is now ON for %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
@@ -7311,7 +7306,7 @@ msgstr ""
 "és teljesen valós ident@host maszkot használja, minden \n"
 "nick esetében végrehajtja az AKILLt."
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Voices védelme"
@@ -7357,11 +7352,11 @@ msgstr "    READ   Elolvassa a megadott üzenete(ke)t"
 msgid "Real name"
 msgstr "Valódi neve: %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7390,14 +7385,14 @@ msgstr "    LEVELS     Átállíthatod a szoba hozzáférési szintjeit"
 msgid "Regains control of your nick"
 msgstr "    RELEASE    Visszaadja a neved a RECOVER után"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s is enable"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7405,8 +7400,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7482,7 +7477,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7580,7 +7575,7 @@ msgstr "    MODLOAD     Betölti a modult"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7660,7 +7655,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
@@ -7670,7 +7665,7 @@ msgstr "    RELOAD      Újratölti a szervíz Konfigurációs fájlját"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Restrict access to the channel"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Korlátozott hozzáférés"
@@ -7822,12 +7817,12 @@ msgstr "NOOP {SET|REVOKE} szerver"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Jelszavad elfogadva - azonosítás sikeres."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Jelszavad elfogadva - azonosítás sikeres."
@@ -7850,7 +7845,7 @@ msgstr "    RESTART     Menti az adatbázist, és újraindítja a szervízt"
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Founderjog védelme"
@@ -7865,7 +7860,7 @@ msgstr "Secure founder option for %s is now ON."
 msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Opjog védelme"
@@ -7890,12 +7885,12 @@ msgstr "Secure option for %s is now ON."
 msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
@@ -7905,7 +7900,7 @@ msgstr "Secure option is now ON for %s."
 msgid "Secureops enforced on %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Biztonság"
 
@@ -7957,7 +7952,7 @@ msgstr "Founderjog védelme"
 msgid "Sends a memo and requests a read receipt"
 msgstr "    RSEND  Memo üzenetet küld és olvasási visszaigazolást kér"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8218,12 +8213,12 @@ msgstr "Services will no longer autoop %s in channels."
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
@@ -8296,7 +8291,7 @@ msgstr "    DISPLAY    Set the display of your group in Services"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       A founder megváltoztatása"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr "    LANGUAGE   A szervíz nyelvezetének megválasztása"
@@ -8707,7 +8702,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8798,11 +8793,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Signed kick option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Signed kicks"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s túl sok üzenettel rendelkezik, és nem fogadhat többet."
@@ -8817,12 +8812,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Bot beállítás időlegesen szünetel."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "A bot módosítás ideiglenesen szünetel."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot beállítás időlegesen szünetel."
 
@@ -8832,7 +8827,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/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 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."
 
@@ -8869,7 +8864,7 @@ msgstr "Üzenet opcióinak beállítása szünetel."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Sajnálom,  a nicknevek regisztrációjának törlése  szünetel."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Sajnálom, a csoportok használata ideiglenesen le van tiltva."
 
@@ -8887,13 +8882,13 @@ msgstr "Neked csak %d  helyed van a csatorna listáján."
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Neked csak %d bejegyzésed lehet a hozzáférési listán."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -9030,7 +9025,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       A vhostot a csoport minden tagjára állítja"
@@ -9039,7 +9034,7 @@ msgstr "    GROUP       A vhostot a csoport minden tagjára állítja"
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -9050,7 +9045,7 @@ msgstr ""
 "\n"
 "Listáz minden nicket a csoportodból."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9285,7 +9280,7 @@ msgstr ""
 "nicknek. Jelszónak ugyanannak kell lennie amit a \n"
 "regisztrációnál megadtál, vagy amire módosítottad."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9478,21 +9473,21 @@ 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/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9500,13 +9495,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "Az  IMMED opció nem elérhető ezen a hálózaton."
 
@@ -9588,7 +9583,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9668,7 +9663,17 @@ msgstr ""
 "korlátozást a szervíz használatban egy támadás alkalmával\n"
 "a hálózaton."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Greet message for %s unset."
@@ -9677,15 +9682,6 @@ msgstr "Greet message for %s unset."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9819,7 +9815,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "Összesen %d üzenet van a %s csatornán."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Törli a vhosztot a nickekröl a csoportban"
@@ -9915,7 +9911,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -9927,7 +9923,7 @@ msgstr ""
 "Ez a parancs lehetővé teszi, hogy a JELENLEGI nick\n"
 "vhostját beállítsuk a csoport minden nickjére."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -10007,7 +10003,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10075,7 +10071,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10118,7 +10114,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10143,7 +10139,7 @@ msgstr ""
 "Ez a parancs betölti azt modult, a modules könyvtárból,\n"
 "amelyiknek a fájlnevét megadtad."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10269,12 +10265,12 @@ msgstr "Kapcsold ki a caps lockod!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       A kill védelem be-,kikapcsolása"
@@ -10314,7 +10310,7 @@ msgstr ""
 "(Máskülönben, bárki kaphat információt a nicknevedről\n"
 "használva az INFO parancsot.)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10345,7 +10341,7 @@ msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     A nickneved védelmének be-,kikapcsolása"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10376,7 +10372,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10453,7 +10449,7 @@ msgstr ""
 "Írd be: /msg %s HELP SET opció bővebb információért az\n"
 "adott opcióról."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10468,8 +10464,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Kitölti a modult"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Nem sikerült eltávolítani a %s modult"
@@ -10696,8 +10692,8 @@ msgstr "A %s csoport vhostja erre változott: %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [#szoba] [list | NEW ]"
@@ -10844,12 +10840,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Már tagja vagy ennek a csoportnak: %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Már be vagy azonosítva. :-)"
 
@@ -10877,6 +10873,11 @@ msgstr "Nem változtathatod meg a max. fogadható üzenetek számát."
 msgid "You are not permitted to change your memo limit."
 msgstr "Nem változtathatod meg a max. fogadható üzenetek számát."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Már be vagy azonosítva. :-)"
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10886,7 +10887,7 @@ msgstr "Most már Szuper-Admin vagy"
 msgid "You are now an IRC Operator."
 msgstr "Most már IRC Operátor vagy!"
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -10950,8 +10951,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Nem ghostolhatod ki magad!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Nincs ilyen bejegyzés a (%s) csatorna hozzáférési listáján."
@@ -10961,7 +10962,7 @@ msgstr "Nincs ilyen bejegyzés a (%s) csatorna hozzáférési listáján."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "%s nem tud kijelentkezni, mert ő egy Services Operator."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
@@ -10976,7 +10977,7 @@ msgstr "%s max. bejövő üzenetek száma nem lehet több, mint %d."
 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/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 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."
 
@@ -11047,7 +11048,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Használd a /msg %s READ %d parancsot."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "You have been invited to %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
@@ -11105,11 +11111,16 @@ msgstr "    DELALL      Törli a vhosztot a nickekröl a csoportban"
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "Nem törölheted ezen a hálózaton az e-mail címed."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11136,7 +11147,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "%s nem tud kijelentkezni, mert ő egy Services Operator."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11167,7 +11178,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -11178,18 +11189,13 @@ msgstr ""
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 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."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s nem érvényes ban típus."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11246,17 +11252,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "A %s nevű bot törölve."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "Már be vagy azonosítva. :-)"
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Már be vagy azonosítva. :-)"
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "E-mail address for %s changed to %s."
@@ -11266,7 +11272,7 @@ msgstr "E-mail address for %s changed to %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Összes O:lines %s módosítva."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11323,12 +11329,12 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "A nicked sikeresen kijelentkezett."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr "A nicked már regisztrált; írd be /msg %s DROP először."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11337,7 +11343,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Nickname %s registered."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "A nickneved most meg lesz változtatva: %s."
@@ -11346,12 +11352,12 @@ msgstr "A nickneved most meg lesz változtatva: %s."
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, 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/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Jelszavad: %s - jegyezd meg a későbbi használathoz!"
@@ -11360,7 +11366,7 @@ msgstr "Jelszavad: %s - jegyezd meg a későbbi használathoz!"
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password request has expired."
 
@@ -11480,7 +11486,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {nick | #szoba}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO nick"
@@ -11489,8 +11495,8 @@ msgstr "INFO nick"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK nicknév "
@@ -11512,7 +11518,7 @@ msgstr "CHANKILL [+lejárat] {#szoba} [indok]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11681,7 +11687,7 @@ msgstr "UNBAN #szoba [nick]"
 msgid "{nick | channel}"
 msgstr "CANCEL {nick | #szoba}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | #szoba} memo-szöveg"
diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po
index 8885338f1..6bc9c8835 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 20:40-0400\n"
 "Last-Translator: Simos <simos@simosnap.org>\n"
 "Language-Team: Italian\n"
@@ -58,7 +58,7 @@ msgstr "%s aggiunto alla lista delle bad words di %s."
 msgid "%s added to %s's access list."
 msgstr "%s aggiunto alla lista di accesso di %s."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s aggiunto alla lista dei certificati di %s."
@@ -78,11 +78,6 @@ msgstr "%s aggiunto alla lista  %s."
 msgid "%s added to the AKILL list."
 msgstr "%s aggiunto alla lista AKILL."
 
-#: modules/commands/ns_cert.cpp:180
-#, c-format
-msgid "%s added to your certificate list."
-msgstr "%s aggiunto alla tua lista dei certificati."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -112,7 +107,7 @@ msgstr ""
 "Per maggiori informazioni sull'uso di un comando\n"
 "specifico, digita %s%s %s comando.\n"
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -129,7 +124,7 @@ msgstr ""
 "Per maggiori informazioni su un comando specifico,\n"
 "digita %s%s %s comando.\n"
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -219,7 +214,7 @@ msgstr "%s eliminato dalla lista delle bad words di %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s eliminato dalla lista di accesso di %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s eliminato dalla tua lista dei certificati di %s."
@@ -239,11 +234,6 @@ msgstr "%s eliminato dalla lista %s"
 msgid "%s deleted from the AKILL list."
 msgstr "%s eliminato dalla lista AKILL."
 
-#: modules/commands/ns_cert.cpp:209
-#, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s eliminato dalla tua lista dei certificati."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -327,7 +317,7 @@ msgstr "%s è già presente nella lista ignore."
 msgid "%s is already suspended."
 msgstr "%s è già sospeso."
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s non è un nick o un canale registrato."
@@ -397,7 +387,7 @@ msgstr ""
 msgid "%s not found on %s %s list."
 msgstr "%1$s non trovato nella lista %3$s di %2$s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s non trovato nella lista nella lista di accesso di %s."
@@ -417,7 +407,7 @@ msgstr "%s non trovato nella lista bad words di %s."
 msgid "%s not found on %s's access list."
 msgstr "%s non trovato nella lista di accesso di %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s non trovato nella lista dei certificati di %s."
@@ -576,6 +566,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "target password"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr "address"
@@ -584,11 +579,11 @@ msgstr "address"
 msgid "botname {ON|OFF}"
 msgstr "botname {ON|OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "channel"
 
@@ -612,8 +607,8 @@ msgstr "channel mask [reason]"
 msgid "channel modes"
 msgstr "channel modes"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "channel nick"
 
@@ -649,7 +644,7 @@ msgstr "channel ADD mask"
 msgid "channel ADD mask level"
 msgstr "channel ADD mask level"
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 msgid "channel ADD message"
 msgstr "channel ADD message"
 
@@ -665,9 +660,9 @@ msgstr "channel ADD {nick | mask} [reason]"
 msgid "channel APPEND topic"
 msgstr "channel APPEND topic"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr "channel CLEAR"
 
@@ -679,11 +674,11 @@ msgstr "channel CLEAR [what]"
 msgid "channel CLEAR [ALL]"
 msgstr "channel CLEAR [ALL]"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 msgid "channel DEL num"
 msgstr "channel DEL num"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "channel DEL {mask | entry-num | list}"
 
@@ -699,7 +694,7 @@ msgstr "channel DEL {word | entry-num | list}"
 msgid "channel ENFORCE"
 msgstr "channel ENFORCE"
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr "channel LIST"
 
@@ -707,8 +702,8 @@ msgstr "channel LIST"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "channel LIST [mask | entry-num | list]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr "channel LIST [mask | list]"
 
@@ -748,11 +743,11 @@ msgstr "channel VIEW [mask | entry-num | list]"
 msgid "channel VIEW [mask | list]"
 msgstr "channel VIEW [mask | list]"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "channel [description]"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "channel [nick]"
 
@@ -776,8 +771,8 @@ msgstr "channel [+expiry] {nick | mask} [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "channel [UNLOCK|LOCK]"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 msgid "channel {ON|OFF}"
 msgstr "channel {ON|OFF}"
 
@@ -808,13 +803,13 @@ msgstr "channel {DIS | DISABLE} type"
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "channel {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "channel {ON | OFF}"
 
@@ -822,7 +817,7 @@ msgstr "channel {ON | OFF}"
 msgid "email"
 msgstr "email"
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 msgid "language"
 msgstr "language"
 
@@ -834,8 +829,8 @@ msgstr "memo-text"
 msgid "message"
 msgstr "message"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr "modname"
 
@@ -847,10 +842,10 @@ msgstr "new-display"
 msgid "new-password"
 msgstr "new-password"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr "nick"
 
@@ -874,12 +869,12 @@ msgstr "nick newnick"
 msgid "nick [reason]"
 msgstr "nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "nickname"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 msgid "nickname address"
 msgstr "nickname address"
 
@@ -887,7 +882,7 @@ msgstr "nickname address"
 msgid "nickname email"
 msgstr "nickname email"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 msgid "nickname language"
 msgstr "nickname language"
 
@@ -919,14 +914,14 @@ msgstr "nickname [+expiry] [reason]"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "nickname {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "nickname {ON | QUICK | IMMED | OFF}"
 
@@ -982,10 +977,6 @@ msgstr "pattern [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "server [reason]"
 
-#: modules/commands/ns_group.cpp:78
-msgid "target password"
-msgstr "target password"
-
 #: modules/commands/os_mode.cpp:139
 msgid "user modes"
 msgstr "user modes"
@@ -994,7 +985,7 @@ msgstr "user modes"
 msgid "user [reason]"
 msgstr "user [reason]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, c-format
 msgid ""
 " \n"
@@ -1075,7 +1066,7 @@ msgstr ""
 "anche se è la stessa di default. La durata di default per le\n"
 "SQLINE può essere trovata con il comando STATS AKILL."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, c-format
 msgid ""
 " \n"
@@ -1217,7 +1208,7 @@ msgstr ""
 "informazioni su come assegnare alcuni di questi privilegi ad\n"
 "altri utenti del canale.\n"
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 msgid ""
 " \n"
 "Services Operators can also drop any nickname without needing\n"
@@ -1546,7 +1537,7 @@ msgstr " Caricato il: %p"
 msgid " but %s mysteriously dematerialized."
 msgstr " ma %s si è misteriosamente smaterializzato."
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1600,7 +1591,7 @@ msgstr "%d bot disponibili."
 msgid "%d modules loaded."
 msgstr "%d Moduli caricati."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nickname nel gruppo."
@@ -1706,9 +1697,9 @@ msgstr "%s (%s) è stato visto l' ultima volta uscire da IRC (%s) %s fa (%s)."
 msgid "%s (minimum %d/%d%%)"
 msgstr "%s (minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "La lista di accesso di %s è vuota."
@@ -1739,8 +1730,8 @@ msgstr "La lista delle bad words di %s è vuota."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s non può essere il successore del canale %s perché ne è il founder."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Comandi di %s:"
@@ -2010,7 +2001,7 @@ msgstr "La lista auto join di %s è vuota."
 msgid "%s's auto join list:"
 msgstr "Lista auto join di %s:"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, c-format
 msgid "%s's certificate list is empty."
 msgstr "La tua lista dei certificati di %s è vuota."
@@ -2112,7 +2103,7 @@ msgstr ". %s è online in questo momento."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2176,15 +2167,16 @@ msgstr "ADD [+expiry] mask limit reason"
 msgid "ADD [nickname] channel [key]"
 msgstr "ADD [nickname] channel [key]"
 
-#: modules/commands/ns_cert.cpp:251
-msgid "ADD [nickname] fingerprint"
-msgstr "ADD [nickname] fingerprint"
-
 #: modules/commands/ns_access.cpp:102
 msgid "ADD [nickname] mask"
 msgstr "ADD [nickname] mask"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "ADD [nickname] fingerprint"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr "ADD [+expiry] mask reason"
 
@@ -2260,7 +2252,7 @@ msgid "Access levels for %s reset to defaults."
 msgstr ""
 "I livelli di accesso di %s sono stati ripristinati ai valori originali."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, c-format
 msgid "Access list for %s:"
 msgstr "Lista di accesso di %s:"
@@ -2398,7 +2390,7 @@ msgstr "Tutti i memo per il canale %s sono stati cancellati."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2433,12 +2425,12 @@ msgstr "Tutte le impostazioni di %s sono state clonate su %s."
 msgid "All user modes on %s have been synced."
 msgstr "Tutti gli user modes su %s sono stati sincronizzati."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, 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"
@@ -2870,7 +2862,7 @@ msgstr ""
 "Esempio:\n"
 "     MODIFY nickserv forcemail no"
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
 "the given user. With MSG set, Services will use messages,\n"
@@ -2880,7 +2872,7 @@ msgstr ""
 "con il nick fornito. Se MSG è attivo, i Services usano i messaggi (query),\n"
 "altrimenti usano i notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3031,11 +3023,11 @@ msgstr "Associa un indirizzo e-mail al tuo nick"
 msgid "Associate oper info with a nick or channel"
 msgstr "Associa oper info a un nick o un canale"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 msgid "Associates the given E-mail address with the nickname."
 msgstr "Associa un indirizzo e-mail al nickname"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
 "This address will be displayed whenever someone requests\n"
@@ -3045,7 +3037,7 @@ msgstr ""
 "Questo indirizzo sarà mostrato quando qualcuno richiede\n"
 "informazioni sul proprio nick con il comando INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3345,8 +3337,8 @@ msgstr "Il bot non kickerà più chi flooda."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Il bot non kickerà più chi ripete."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3384,7 +3376,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Non puoi clonare il canale %s su se stesso!"
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Impossibile inviare e-mail adesso, riprova più tardi."
 
@@ -3438,7 +3430,7 @@ msgstr ""
 "Services nello stesso istante in cui il comando viene\n"
 "inviato."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, c-format
 msgid "Certificate list for %s:"
 msgstr "Lista dei certificati di %s:"
@@ -3451,7 +3443,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "Cambia i modi del canale."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 msgid "Change the communication method of Services"
 msgstr "Cambia il metodo di comunicazione usato dai Services"
 
@@ -3488,7 +3480,7 @@ msgstr ""
 "Imposta il nuovo founder del canale. Il nick specificato\n"
 "deve essere registrato."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
@@ -3501,7 +3493,7 @@ msgstr ""
 "La lingua può essere scelta dalla seguente lista di\n"
 "lingue supportate:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 msgid ""
 "Changes the language Services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
@@ -3540,7 +3532,7 @@ msgstr ""
 "è ancora registrato, il successore diventerà il nuovo\n"
 "founder del canale. Il nick specificato deve essere registrato."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 msgid "Channel"
 msgstr "Canale"
 
@@ -3624,7 +3616,7 @@ msgstr "Il canale %s non scadrà."
 msgid "Channel %s %s list has been cleared."
 msgstr "La lista %2$s del canale %1$s è stata svuotata."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "La lista di accesso del canale %s è stata svuotata."
@@ -3658,8 +3650,8 @@ msgstr "Lista Canali:"
 msgid "Channel stats for %s on %s:"
 msgstr "Statistiche del canale per %s su %s:"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 msgid "Channels may not be on access lists."
 msgstr "I canali possono non essere nelle liste di accesso"
 
@@ -3813,7 +3805,7 @@ msgstr "Conferma un codice.di.attivazione (passcode) di nickserv"
 msgid "Control modes and mode locks on a channel"
 msgstr "Controlla i modi e il blocco dei modi di un canale"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -3837,20 +3829,20 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Copia tutte le impostazioni da un canale ad un altro"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 msgid "Created"
 msgstr "Creato"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 msgid "Creator"
 msgstr "Autore"
 
@@ -3903,7 +3895,7 @@ msgstr "DEL target info"
 msgid "DEL [nickname] channel"
 msgstr "DEL [nickname] channel"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 msgid "DEL [nickname] fingerprint"
 msgstr "DEL [nickname] fingerprint"
 
@@ -3911,8 +3903,8 @@ msgstr "DEL [nickname] fingerprint"
 msgid "DEL [nickname] mask"
 msgstr "DEL [nickname] mask"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL {mask | entry-num | list | id}"
 
@@ -4215,8 +4207,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 msgid "Description"
 msgstr "Descrizione"
 
@@ -4370,12 +4362,12 @@ msgstr ""
 "i canali di cui sei founder. Qualsiasi altro utente avrà la\n"
 "possibilità di avere il controllo di questo nick."
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Indirizzo e-mail per %s cambiato in %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Indirizzo e-mail per %s rimosso."
@@ -4444,7 +4436,7 @@ msgstr "Abilita i comandi Fantasy"
 msgid "Enable greet messages"
 msgstr "Abilita il messaggio di saluto"
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr "Abilita o disabilita il mantenimento degli user mode"
 
@@ -4475,7 +4467,7 @@ msgstr ""
 "e provvederanno a reimpostatarli la prossima volta che il canale\n"
 "sarà creato."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
@@ -4486,7 +4478,7 @@ msgstr ""
 "usermodes dell' utente, e provvederanno a reimpostarli la prossima\n"
 "volta che si autenticherà."
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -4677,7 +4669,7 @@ msgstr "Fine della lista dei canali."
 msgid "End of configuration."
 msgstr "Fine della configurazione."
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 msgid "End of entry message list."
 msgstr "Fine della lista dei messaggi di ingresso."
 
@@ -4695,7 +4687,7 @@ msgstr "Fine della lista forbid."
 msgid "End of list - %d channels shown."
 msgstr "Fine della lista - %d canali mostrati."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fine della lista - %d/%d risultati mostrati."
@@ -4744,37 +4736,37 @@ msgstr ""
 "a quando il numero degli stessi non scende al di sotto del limite canale,\n"
 "se un limite è impostato"
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Italiano"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Il messaggio di ingresso %i per %s rimosso."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Il messaggio di ingresso %s non è stato trovato nel canale %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, c-format
 msgid "Entry message added to %s"
 msgstr "Messaggio di ingresso aggiunto a %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, c-format
 msgid "Entry message list for %s is empty."
 msgstr "La lista dei messaggi di ingresso di %s è vuota."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, c-format
 msgid "Entry message list for %s:"
 msgstr "Lista dei messaggi di ingresso di %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Tutti i messaggi di ingresso di %s sono stati cancellati."
@@ -4801,7 +4793,7 @@ msgid ""
 msgstr ""
 "Errore! Il vHost è troppo lungo, usa un hostname più corto di %d caratteri."
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -4840,12 +4832,12 @@ msgstr "L'eccezione per %s (numero %d) è stata spostata alla posizione %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception per %s è stata aggiornata in %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 msgid "Expires"
 msgstr "Scadenza"
 
@@ -4859,7 +4851,7 @@ msgstr "Scadenza e reason aggiornati per %s."
 msgid "Expiry for %s updated."
 msgstr "Scadenza per %s modificata."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasia"
 
@@ -4877,11 +4869,16 @@ msgstr "La modalità fantasy ora è ATTIVA sul canale %s."
 msgid "Find a user's status on a channel"
 msgstr "Trova lo stato di un utente in un canale"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "La firma digitale %s è già present nella lista dei certificati di %s."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "%s è già presente in %s."
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5101,11 +5098,11 @@ msgstr "La lista ignore è vuota."
 msgid "Ignore list:"
 msgstr "Lista ignore:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 msgid "Immediate protection"
 msgstr "Protezione immediata"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 msgid "Incorrect email address."
 msgstr "Indirizzo e-mail non corretto"
 
@@ -5191,16 +5188,16 @@ msgstr "Kick in caso di italics"
 msgid "Join a group"
 msgstr "Entra in un gruppo"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 msgid "Keep modes"
 msgstr "Mantenimento modes"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Il mantenimento dei modi per %s è stato disattivato."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Il mantenimento dei modi per %s è stato attivato."
@@ -5218,7 +5215,7 @@ msgstr "La key per il canale %s è %s."
 msgid "Kick a user from a channel"
 msgstr "Espelle un utente da un canale"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5257,8 +5254,8 @@ msgstr "LIMIT forzato su %s, %d utenti rimossi."
 msgid "LIST threshold"
 msgstr "LIST soglia"
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr "LIST [mask | list | id]"
 
@@ -5266,8 +5263,8 @@ msgstr "LIST [mask | list | id]"
 msgid "LIST [mask | list]"
 msgstr "LIST [mask | list]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 msgid "LIST [nickname]"
 msgstr "LIST [nickname]"
 
@@ -5275,7 +5272,7 @@ msgstr "LIST [nickname]"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [testo|numero]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Lingua cambiata a Italiano."
 
@@ -5288,7 +5285,7 @@ msgstr "L'ultimo memo inviato a %s è stato annullato."
 msgid "Last quit message"
 msgstr "Ultimo messaggio di quit"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 msgid "Last seen"
 msgstr "Ultimo accesso"
 
@@ -5300,7 +5297,7 @@ msgstr "Ultimo indirizzo usato"
 msgid "Last topic"
 msgstr "Ultimo topic"
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 msgid "Last used"
 msgstr "Ultimo usato"
 
@@ -5328,8 +5325,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Il livello deve essere compreso tra %d e %d (inclusi)."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5351,17 +5348,17 @@ msgstr "La lista per il modo %c è piena."
 msgid "List loaded modules"
 msgstr "Elenca i moduli caricati"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista delle voci corrispondenti %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista dei nick nel gruppo di %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Lista dei nick nel tuo gruppo:"
 
@@ -5414,7 +5411,7 @@ msgstr ""
 "avranno come prefisso un punto esclamativo. Il parametro nick\n"
 "è limitato ai Services Operators"
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 msgid "Lists all nicknames in your group"
 msgstr "Mostra tutti i nickname nel tuo gruppo"
 
@@ -5915,7 +5912,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Gestisce le zone DNS per questo network."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 msgid "Manage the channel's entry messages"
 msgstr "Gestisce il messaggio di ingresso del canale"
 
@@ -5944,15 +5941,15 @@ msgstr "Gestisce il sistema DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "Gestisce il topic del canale specificato"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -5965,8 +5962,8 @@ msgstr "La mask %s è già presente lista di accesso di %s."
 msgid "Mask must be in the form user@host."
 msgstr "La mask deve essere nel formato user@host."
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 msgid "Masks and unregistered users may not be on access lists."
 msgstr ""
 "Mask e utenti non registrati non possono essere aggiunti in una lista di "
@@ -6016,7 +6013,7 @@ msgstr "Il limite dei memo di %s è stato impostato a %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Il limite dei memo di %s è stato impostato a 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo inviato a %s."
@@ -6026,11 +6023,11 @@ msgstr "Memo inviato a %s."
 msgid "Memos for %s:"
 msgstr "Memo per %s:"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 msgid "Message"
 msgstr "Messaggio"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Modalità messaggio"
 
@@ -6107,7 +6104,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Visualizza la lista di accesso attuale."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6137,11 +6134,11 @@ msgstr "Modifica la lista degli utenti %s"
 msgid "Modify the list of authorized addresses"
 msgstr "Modifica la lista degli indirizzi autorizzati"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 msgid "Modify the list of privileged users"
 msgstr "Modifica la lista degli utenti con privilegi"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 msgid "Modify the nickname client certificate list"
 msgstr "Modifica la lista dei certificati del client per il nickname"
 
@@ -6192,10 +6189,10 @@ msgstr "Modulo: %s Versione: %s Autore: %s caricato: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Modulo: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr "Nome"
 
@@ -6212,9 +6209,9 @@ msgstr "Statistiche network per %s:"
 msgid "Never"
 msgstr "Mai"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 msgid "Nick"
 msgstr "Nick"
 
@@ -6278,12 +6275,12 @@ msgstr "il nickname %s non è registrato."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Il nick %s è stato troncato a %d caratteri."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Il nick %s scadrà."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Il nick %s non scadrà."
@@ -6298,7 +6295,7 @@ msgstr "Il nick %s non ha un tuo memo."
 msgid "Nick %s has been logged out."
 msgstr "Il nick %s è stato deidentificato."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Il nick %s è stato rimosso dal gruppo da %s."
@@ -6308,7 +6305,7 @@ msgstr "Il nick %s è stato rimosso dal gruppo da %s."
 msgid "Nick %s is currently suspended."
 msgstr "Il nick %s è attualmente sospeso."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, c-format
 msgid "Nick %s is not in your group."
 msgstr "Il nick %s non è nel tuo gruppo."
@@ -6348,17 +6345,17 @@ msgstr "Il nickname %s è già registrato!"
 msgid "Nickname %s may not be registered."
 msgstr "Il nickname %s non può essere registrato."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Il nick %s è stato registrato sotto la tua user@host-mask: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registrato."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 msgid "No auto-op"
 msgstr "No auto-op"
 
@@ -6366,7 +6363,7 @@ msgstr "No auto-op"
 msgid "No bot"
 msgstr "Nessun bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 msgid "No expire"
 msgstr "Nessuna scadenza"
 
@@ -6399,8 +6396,8 @@ msgstr "Nessuna corrispondenza trovata per %s."
 msgid "No matching entries on %s %s list."
 msgstr "Nessun record corrispondente nella lista %2$s di %1$s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nessun record corrispondente nella lista di accesso di %s."
@@ -6471,8 +6468,8 @@ msgstr "Nessuna richista trovata per il nick %s."
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "No kick firmati quanto è usato SIGNKICK LEVEL"
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, c-format
 msgid "No stats for %s."
 msgstr "Non ci sono stats per %s:"
@@ -6482,7 +6479,7 @@ msgstr "Non ci sono stats per %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "Nessuna informazione \"%s\" su %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, c-format
 msgid "No users on %s match %s."
 msgstr "Nessun user su %s corrisponde a %s."
@@ -6510,17 +6507,17 @@ msgstr "Nessuna"
 msgid "Nothing to do."
 msgstr "Niente da eseguire."
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr "Numero"
 
@@ -6641,12 +6638,12 @@ msgstr "La password di %s è %s."
 msgid "Password incorrect."
 msgstr "Password errata."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "E' stata inviata una email per il reset della password di %s."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Peace"
 
@@ -6660,7 +6657,7 @@ msgstr "L'opzione peace per %s è ora disattivata."
 msgid "Peace option for %s is now on."
 msgstr "L'opzione peace per %s è ora attiva."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 msgid "Persistent"
 msgstr "Persistant"
 
@@ -6702,18 +6699,18 @@ msgstr "Attendi %d secondi è riprova."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Attendi %d secondi prima di richiedere un nuovo vHost."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Attendi %d secondi prima di usare di nuovo il comando %s."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -6752,7 +6749,7 @@ msgstr "Impedisce ad un canale di scadere"
 msgid "Prevent the nickname from appearing in the LIST command"
 msgstr "Nasconde il nickname dall' output del comando LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 msgid "Prevent the nickname from expiring"
 msgstr "Impedisce ad un nickname di scadere"
 
@@ -6760,8 +6757,8 @@ msgstr "Impedisce ad un nickname di scadere"
 msgid "Prevents users being kicked by Services"
 msgstr "Impedisce agli utenti di essere kickati dai Services"
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privato"
 
@@ -6805,26 +6802,26 @@ msgstr "Il privilegio %s è stato aggiunto a %s su %s, le nuove flags sono +%s"
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr "Il privilegio %s è stato rimosso a %s su %s, le nuove flags sono +%s"
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Protezione"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, c-format
 msgid "Protection is now off for %s."
 msgstr "La protezione è adesso disattivata per %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, c-format
 msgid "Protection is now on for %s, with a reduced delay."
 msgstr "La protezione è adesso attiva per %s, con un ritardo ridotto."
 
-#: modules/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "La protezione è adesso attiva per %s, senza ritardo."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, c-format
 msgid "Protection is now on for %s."
 msgstr "La protezione è adesso attiva per %s."
@@ -6839,7 +6836,7 @@ msgstr ""
 "Utilizza la mask completa ident@host per ogni nick,\n"
 "in seguito imposta l'AKILL. "
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 msgid "Quick protection"
 msgstr "Protezione rapida"
 
@@ -6881,11 +6878,11 @@ msgstr "Legge uno o più memo"
 msgid "Real name"
 msgstr "Real name"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -6918,13 +6915,13 @@ msgstr "Ridefinisce i privilegi dei livelli di accesso"
 msgid "Regains control of your nick"
 msgstr "Permette di riottenere il controllo del proprio nick"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 msgid "Regex is disabled."
 msgstr "Le espressioni regolari sono disabilitate."
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -6934,8 +6931,8 @@ msgstr ""
 "Se vuoi puoi includere la mask tra //."
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7002,7 +6999,7 @@ msgstr ""
 "impostazioni del canale e riceverà automaticamente da %s\n"
 "i privilegi di operatore del canale quando vi accede."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7080,7 +7077,7 @@ msgstr "Riarica un modulo"
 msgid "Reload services' configuration file"
 msgstr "Rilegge il file di configurazione dei Services"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 msgid "Remove a nick from a group"
 msgstr "Rimuove un nick da un gruppo"
 
@@ -7161,7 +7158,7 @@ msgstr ""
 "da un amministratore della rete. Nel frattempo, rimani in attesa\n"
 "che la tua richiesta sia presa in considerazione."
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 msgid "Resend registration confirmation email"
 msgstr "Reinvia l' email di conferma per la registrazione"
 
@@ -7169,7 +7166,7 @@ msgstr "Reinvia l' email di conferma per la registrazione"
 msgid "Restrict access to the channel"
 msgstr "Limita l'accesso al canale"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 msgid "Restricted access"
 msgstr "Acesso limitato"
 
@@ -7295,13 +7292,14 @@ msgstr "SET server"
 msgid "SET server.name option value"
 msgstr "SET server.name option value"
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr ""
-"Firma digitale del certificato SSL accettata - adesso  sei identificato come %s."
+"Firma digitale del certificato SSL accettata - adesso  sei identificato come"
+" %s."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr ""
 "Firma digitale del certificato SSL accettata - adesso sei riconosciuto."
@@ -7323,7 +7321,7 @@ msgstr "Salva i database e riavvia i Services"
 msgid "Searches logs for a matching pattern"
 msgstr "Cerca nei log per la chiave specificata corrispondente"
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 msgid "Secure founder"
 msgstr "Secure Founder"
 
@@ -7337,7 +7335,7 @@ msgstr "L'opzione Secure founder per %s è ora disattivata."
 msgid "Secure founder option for %s is now on."
 msgstr "L'opzione Secure founder per %s è ora attiva."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 msgid "Secure ops"
 msgstr "Secure ops"
 
@@ -7361,12 +7359,12 @@ msgstr "L'opzione Secure per %s è ora disattivata."
 msgid "Secure option for %s is now on."
 msgstr "L'opzione Secure per %s è ora attiva."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, c-format
 msgid "Secure option is now off for %s."
 msgstr "Opzione secure disattivata per %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, c-format
 msgid "Secure option is now on for %s."
 msgstr "Opzione secure attiva per %s."
@@ -7376,7 +7374,7 @@ msgstr "Opzione secure attiva per %s."
 msgid "Secureops enforced on %s."
 msgstr "Secureops forzato su %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Sicurezza"
 
@@ -7422,7 +7420,7 @@ msgstr "Mittente"
 msgid "Sends a memo and requests a read receipt"
 msgstr "Invia un memo e richiede una notifica di lettura"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
 "reset their password.  Email must be the email address associated\n"
@@ -7659,12 +7657,12 @@ msgstr "I servizi non imposterannno più lo stato di %s nei canali."
 msgid "Services will now automatically give modes to users in %s."
 msgstr "I servizi imposteranno automaticamente lo stato degli utenti su %s."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "I servizi risponderanno a %s usando i messaggi."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "I servizi risponderanno a %s usando i notices."
@@ -7727,7 +7725,7 @@ msgstr "Imposta il nome del tuo gruppo"
 msgid "Set the founder of a channel"
 msgstr "Imposta il founder del canale"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 msgid "Set the language Services will use when messaging you"
 msgstr "Imposta la lingua utilizzata dai Services"
 
@@ -8086,7 +8084,7 @@ msgstr ""
 "di impostare lo stato del nickname specificato automaticamente\n"
 "quando accede al canale."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
@@ -8168,11 +8166,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "L'opzione Signed kick per %s è ora attiva."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Signed kick"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s attualmente ha troppi memo e non può riceverne altri."
@@ -8186,12 +8184,12 @@ msgstr "Spiacente, non ho visto %s."
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Spiacente, l'assegnazione dei bot è temporaneamente disabilitata."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Spiacente, la modifica dei bot è temporaneamente disabilitata."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr ""
 "Spiacente, l'impostazione delle opzioni dei bot è temporaneamente "
@@ -8203,7 +8201,7 @@ msgstr ""
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Spiacente, la modifica della lista %s è temporaneamente disabilitata."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Spiacente, la modifica della lista di accesso dei canali è temporaneamente "
@@ -8246,7 +8244,7 @@ msgstr "Spiacente, l'invio dei memo è temporaneamente disabilitato."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Spiacente, la deregistrazione dei nick è temporaneamente disabilitata."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Spiacente, il raggruppamento dei nick è temporaneamente disabilitato."
 
@@ -8266,13 +8264,13 @@ msgstr ""
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr "Spiacente, il limite massimo di %d auto join è stato raggiunto."
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Spiacente, il limite massimo di %d certificati è stato raggiunto."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8405,7 +8403,7 @@ msgstr ""
 "Sincronizza tutti i modi impostati sugli utenti di un canale con\n"
 "i modi che dovrebbero avere in base al loro accesso."
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "Sincronizza il vhost per tutti i nick nel gruppo"
 
@@ -8413,7 +8411,7 @@ msgstr "Sincronizza il vhost per tutti i nick nel gruppo"
 msgid "Syntax"
 msgstr "Sintassi"
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8424,7 +8422,7 @@ msgstr ""
 " \n"
 "Mostra tutti i nick del tuo gruppo."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -8661,7 +8659,7 @@ msgstr ""
 "durante il processo di registrazione utilizzando il\n"
 "comando REGISTER."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -8852,7 +8850,7 @@ msgstr ""
 " \n"
 "Il comando CLEAR rimuove tutti i records dalla lista bad words."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
@@ -8862,7 +8860,7 @@ msgstr ""
 "alla lista dei messaggi da mostrare agli utenti al momento\n"
 "dell' ingresso nel canale."
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8873,7 +8871,7 @@ msgstr ""
 "dell' ingresso nel canale, l' invio del messaggio di\n"
 "di ingresso è di conseguenza disabilitato."
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -8886,7 +8884,7 @@ msgstr ""
 "il suo id numerico che puoi recuperare visualizzando la lista\n"
 "dei messaggi come spiegato di seguito."
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
@@ -8894,7 +8892,7 @@ msgstr ""
 "Il comando ENTRYMSG LISTmosta la lista dei messaggi da mostrareagli utenti "
 "al momento dell' ingresso nel canale."
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "L'opzione IMMED non è disponibile su questa rete."
 
@@ -8992,7 +8990,7 @@ msgstr ""
 "Il comando STATS mostra le statistiche relative ai memorizzati e l' uso "
 "della memoria."
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 msgid ""
 "The email parameter is optional and will set the email\n"
 "for your nick immediately.\n"
@@ -9097,7 +9095,17 @@ msgstr ""
 "di restrizioni dei servizi predefinite, utili durante un tentativo\n"
 "d'attacco sul network."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr "L' indirizzo email specificato ha raggiunto il limite di %d utenti."
+
+#: modules/ns_maxemail.cpp:28
+#, fuzzy, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr "L' indirizzo email specificato ha raggiunto il limite di 1 utente."
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, c-format
 msgid "The entry message list for %s is full."
 msgstr "La lista dei messaggi di ingresso per %s è piena."
@@ -9106,15 +9114,6 @@ msgstr "La lista dei messaggi di ingresso per %s è piena."
 msgid "The following feature/function names are available:"
 msgstr "I seguenti nomi di caratteristiche/funzioni sono disponibili:"
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr "L' indirizzo email specificato ha raggiunto il limite di %d utenti."
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "L' indirizzo email specificato ha raggiunto il limite di 1 utente."
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9250,7 +9249,7 @@ msgstr "Non ci sono servers configurati."
 msgid "There are no forbids of type %s."
 msgstr "Non sono presenti forbid di tipo %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 msgid "There are too many nicks in your group."
 msgstr "Sono presenti troppo nick nel tuo gruppo."
 
@@ -9345,7 +9344,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 msgid ""
 "This command allows users to set the vhost of their\n"
 "CURRENT nick to be the vhost for all nicks in the same\n"
@@ -9354,7 +9353,7 @@ 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/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9421,7 +9420,7 @@ msgstr ""
 "Questo comando carica il modulo chiamato modname dalla cartella\n"
 "modules."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 msgid ""
 "This command makes your nickname join the target nickname's\n"
 "group. password is the password of the target nickname.\n"
@@ -9488,7 +9487,7 @@ msgstr ""
 "I Services Operators possono specificare un nick per modificare la lista\n"
 "auto join di altri utenti."
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -9547,7 +9546,7 @@ msgstr ""
 "specificato. L' uso di questo comando è limitato agli utenti che hanno\n"
 "accesso alla possibilità di modificare la lista di accesso del canale."
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
@@ -9565,7 +9564,7 @@ msgstr ""
 msgid "This command unloads the module named modname."
 msgstr "Questo comando scarica il modulo chiamato modname."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 "Questo comando permette di ottenere il reinvio della email di conferma per "
@@ -9695,11 +9694,11 @@ msgstr "Disattiva il caps lock!"
 msgid "Turn chanstats statistics on or off"
 msgstr "Attiva o disattiva le statistiche chanstats"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 msgid "Turn nickname security on or off"
 msgstr "Attiva o disattiva le impostazioni di sicurezza"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 msgid "Turn protection on or off"
 msgstr "Attiva o disattiva le impostazioni di protezione"
 
@@ -9733,7 +9732,7 @@ msgstr ""
 "chiunque sappia il tuo nick può leggerne le informazioni con il\n"
 "comando INFO."
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -9760,7 +9759,7 @@ msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr ""
 "Attiva o disattiva le statistiche di chanstats nel canale per questo utente."
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -9789,7 +9788,7 @@ msgstr ""
 "opzione se non è strettamente necessario.\n"
 "L'opzione IMMED, inoltre, potrebbe non essere disponibile."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -9866,7 +9865,7 @@ msgstr ""
 "Digita %s%s HELP %s option per ottenere maggiori\n"
 "informazioni su un opzione specifica."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -9881,8 +9880,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "Rimuove un modulo"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Impossibile trovare la regex engine %s."
@@ -10090,8 +10089,8 @@ msgstr "Il vhost per il gruppo %s è stato impostato a %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 msgid "VIEW [mask | list | id]"
 msgstr "VIEW [mask | list | id]"
 
@@ -10232,12 +10231,12 @@ msgstr ""
 msgid "Word"
 msgstr "Word"
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Sei già un membro del gruppo %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Sei già identificato."
 
@@ -10262,6 +10261,11 @@ msgstr "Non ti è permesso accedere a questo canale."
 msgid "You are not permitted to change your memo limit."
 msgstr "Non puoi modificare limite dei tuoi memo."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Non sei identificato."
+
 #: modules/commands/os_set.cpp:85
 msgid "You are now a super admin."
 msgstr "Ora sei un SuperAdmin."
@@ -10270,7 +10274,7 @@ msgstr "Ora sei un SuperAdmin."
 msgid "You are now an IRC Operator."
 msgstr "Ora sei un IRC Operator."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
 "Adesso sei identificato per il tuo nick. Cambia la tua password adesso."
@@ -10333,8 +10337,8 @@ msgstr "Non puoi rimuovere i bot quando persist è impostato nel canale."
 msgid "You can't %s yourself!"
 msgstr "Non puoi %s te stesso!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 msgid "You can't add a channel to its own access list."
 msgstr "Non puoi aggiungere un canale alla sua stessa access list."
 
@@ -10343,7 +10347,7 @@ msgstr "Non puoi aggiungere un canale alla sua stessa access list."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Non puoi deidentificare %s , è un Services Operator."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, c-format
 msgid "You cannot %s on this network."
 msgstr "Non puoi usare %s su questo network."
@@ -10360,7 +10364,7 @@ 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/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Non puoi annullare l'impostazione dell'e-mail."
 
@@ -10433,7 +10437,12 @@ msgstr ""
 "Hai un nuovo memo da %s.\n"
 "Digita %s%s READ %d per leggerlo."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Sei stato invitato in %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Sei stato invitato in %s."
@@ -10487,10 +10496,15 @@ msgstr "Puoi deregistrare qualsiasi nick del tuo gruppo."
 msgid "You may not (un)lock mode %c."
 msgstr "Non puoi sbloccare/bloccare il modo %c."
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "Non puoi cambiare l'e-mail di altri Services Operators."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "Non puoi cambiare l'e-mail di altri Services Operators."
+
 #: modules/commands/ns_set.cpp:191
 msgid "You may not change the password of other Services Operators."
 msgstr "Non puoi cambiare la password di altri Services Operators."
@@ -10514,7 +10528,7 @@ msgstr ""
 "Puoi consultare la lista di accesso degli altri Services Operators, ma non "
 "modificarla."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
 msgstr ""
@@ -10549,7 +10563,7 @@ msgstr ""
 "E' necessario specificare il nome del canale due volte come conferma che "
 "vuoi deregistrare %s."
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -10563,7 +10577,7 @@ msgstr ""
 "E' necessario avere i privilegi %s(ME) nel canale per poter usare questo "
 "comando."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -10573,10 +10587,6 @@ msgstr ""
 "Questa e-mail ti permetterà di recuperare la tua password\n"
 "nel caso tu la dimentichi."
 
-#: modules/commands/ns_register.cpp:135
-msgid "You must specify an email address."
-msgstr "E' necessario specificare un indirizzo email."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "E' necessario essere identificati per usare questo comando."
@@ -10635,16 +10645,16 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Il tuo account %s è stato creato con successo."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 msgid "Your account is already confirmed."
 msgstr "Il tuo account è già stato confermato."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Se non confermato, il tuo account scadra in %s."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Il tuo indirizzo email è stato cambiato in %s."
@@ -10653,7 +10663,7 @@ msgstr "Il tuo indirizzo email è stato cambiato in %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Il tuo indirizzo email non è consentito, scegline un altro diverso."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 #, fuzzy
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
@@ -10712,11 +10722,11 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Non sei più identificato per il tuo nick."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 msgid "Your nick is already registered."
 msgstr "Il tuo nick è già registrato."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 msgid "Your nick is not grouped to anything, you can't ungroup it."
 msgstr "Il tuo nick è presente in nessun gruppo, non puoi usare UNGROUP."
 
@@ -10724,7 +10734,7 @@ msgstr "Il tuo nick è presente in nessun gruppo, non puoi usare UNGROUP."
 msgid "Your nick isn't registered."
 msgstr "Il tuo nickname non è registrato."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Il tuo nick sarà cambiato in %s"
@@ -10733,12 +10743,12 @@ msgstr "Il tuo nick sarà cambiato in %s"
 msgid "Your oper block doesn't require logging in."
 msgstr "Il tuo blocco oper non richiede l' accesso."
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Il codice di attivazione è stato reinviato a %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "La tua password è %s - non dimenticarla!"
@@ -10749,7 +10759,7 @@ msgstr ""
 "La password scelta è troppo lunga. Per favore prova di nuovo con una "
 "password più corta."
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "La tua richiesta di reset della password è scaduta."
 
@@ -10857,7 +10867,7 @@ msgstr "[key|#X-Y]"
 msgid "[nick | channel]"
 msgstr "[nick | canale]"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 msgid "[nick]"
 msgstr "[nick]"
 
@@ -10865,8 +10875,8 @@ msgstr "[nick]"
 msgid "[nickname [REVALIDATE]]"
 msgstr "[nickname [REVALIDATE]]"
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr "[nickname]"
 
@@ -10886,7 +10896,7 @@ msgstr "[+expiry] channel reason"
 msgid "[Hostname hidden]"
 msgstr "[Hostname nascosto]"
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr "[Sospeso]"
 
@@ -11049,6 +11059,6 @@ msgstr "{channel | nickname}"
 msgid "{nick | channel}"
 msgstr "{nick | channel}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 msgid "{nick | channel} memo-text"
 msgstr "{nick | channel} memo-text"
diff --git a/language/anope.nl_NL.po b/language/anope.nl_NL.po
index 48eb34f38..a6e2c5166 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: 2014-03-17 01:00+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2014-03-17 01:11+0100\n"
 "Last-Translator: Robby <robby@chat.be>\n"
 "Language-Team: Dutch\n"
@@ -320,7 +320,7 @@ msgstr "%s staat al op de negeerlijst."
 msgid "%s is already suspended."
 msgstr "%s is reeds geschorst."
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s is geen geregistreerde niet-verboden nick of kanaal."
@@ -389,7 +389,7 @@ msgstr "%s stemt overeen met autokick %s op %s (%s)."
 msgid "%s not found on %s %s list."
 msgstr "%s niet gevonden op %s %s lijst."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s niet gevonden op %s toegangslijst."
@@ -586,11 +586,11 @@ msgstr "adres"
 msgid "botname {ON|OFF}"
 msgstr "botnick {ON|OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 msgid "channel"
 msgstr "kanaal"
 
@@ -614,8 +614,8 @@ msgstr "kanaal masker [reden]"
 msgid "channel modes"
 msgstr "kanaal modes"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 msgid "channel nick"
 msgstr "kanaal nick"
 
@@ -667,9 +667,9 @@ msgstr "kanaal ADD {nick | masker} [reden]"
 msgid "channel APPEND topic"
 msgstr "kanaal APPEND topic"
 
-#: modules/commands/cs_entrymsg.cpp:197 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 msgid "channel CLEAR"
 msgstr "kanaal CLEAR"
 
@@ -685,7 +685,7 @@ msgstr "kanaal CLEAR [ALL]"
 msgid "channel DEL num"
 msgstr "kanaal DEL nr"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "kanaal DEL {masker | nr | lijst}"
 
@@ -701,7 +701,7 @@ msgstr "kanaal DEL {woord | nr | lijst}"
 msgid "channel ENFORCE"
 msgstr "kanaal ENFORCE"
 
-#: modules/commands/cs_entrymsg.cpp:196 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 msgid "channel LIST"
 msgstr "kanaal LIST"
 
@@ -709,8 +709,8 @@ msgstr "kanaal LIST"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "kanaal LIST [masker | nr | lijst]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 msgid "channel LIST [mask | list]"
 msgstr "kanaal LIST [masker | lijst]"
 
@@ -750,11 +750,11 @@ msgstr "kanaal VIEW [masker | nr | lijst]"
 msgid "channel VIEW [mask | list]"
 msgstr "kanaal VIEW [masker | lijst]"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 msgid "channel [description]"
 msgstr "kanaal [beschrijving]"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 msgid "channel [nick]"
 msgstr "kanaal [nick]"
 
@@ -778,8 +778,8 @@ msgstr "kanaal [+verlooptijd] {nick | masker} [reden]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "kanaal [UNLOCK|LOCK]"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 msgid "channel {ON|OFF}"
 msgstr "kanaal {ON|OFF}"
 
@@ -810,13 +810,13 @@ msgstr "kanaal {DIS | DISABLE} type"
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "kanaal {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 msgid "channel {ON | OFF}"
 msgstr "kanaal {ON | OFF}"
 
@@ -836,8 +836,8 @@ msgstr "memo-tekst"
 msgid "message"
 msgstr "bericht"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr "modnaam"
 
@@ -849,10 +849,10 @@ msgstr "nieuwe-weergave"
 msgid "new-password"
 msgstr "nieuw-wachtwoord"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 msgid "nick"
 msgstr "nick"
 
@@ -876,8 +876,8 @@ msgstr "nick nieuwenick"
 msgid "nick [reason]"
 msgstr "nick [reden]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 msgid "nickname"
 msgstr "nick"
 
@@ -921,10 +921,10 @@ msgstr "nick [+verlooptijd] [reden]"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "nick {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:608 modules/commands/ns_set.cpp:959
-#: modules/commands/ns_set.cpp:1050 modules/commands/ns_set.cpp:1079
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 msgid "nickname {ON | OFF}"
 msgstr "nickname {ON | OFF}"
 
@@ -1705,9 +1705,9 @@ msgstr "%s (%s) werd het laatst gezien bij het quitten (%s) %s geleden (%s)."
 msgid "%s (minimum %d/%d%%)"
 msgstr "%s (minimaal %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s toegangslijst is leeg."
@@ -1739,8 +1739,8 @@ msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr ""
 "%s kan de opvolger niet zijn op kanaal %s omdat hij/zij de stichter is."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "%s commando's:"
@@ -2190,7 +2190,7 @@ msgstr "ADD [nick] masker"
 msgid "ADD [nickname] [fingerprint]"
 msgstr "ADD [nick] [vingerafdruk]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 msgid "ADD [+expiry] mask reason"
 msgstr "ADD [+verlooptijd] masker reden"
 
@@ -2265,7 +2265,7 @@ msgstr "Toegangsniveau instellingen voor kanaal %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Toegangsniveaus voor %s teruggezet naar standaardwaarden."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, c-format
 msgid "Access list for %s:"
 msgstr "Toegangslijst voor %s:"
@@ -3352,8 +3352,8 @@ msgstr "Bot zal niet meer kicken voor flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Bot zal niet meer kicken voor herhalingen."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr "Door"
 
@@ -3545,7 +3545,7 @@ msgstr ""
 "de nieuwe stichter van het kanaal. De nieuwe nick moet een\n"
 "geregistreerde nick zijn."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 msgid "Channel"
 msgstr "Kanaal"
 
@@ -3629,7 +3629,7 @@ msgstr "Kanaal %s zal niet verlopen."
 msgid "Channel %s %s list has been cleared."
 msgstr "Kanaal %s %s lijst is leeggemaakt."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanaal %s toegangslijst is leeggemaakt."
@@ -3663,8 +3663,8 @@ msgstr "Kanaallijst:"
 msgid "Channel stats for %s on %s:"
 msgstr "Kanaalstatistieken voor %s op %s:"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 msgid "Channels may not be on access lists."
 msgstr "Kanalen mogen niet op de toegangslijst staan."
 
@@ -3844,20 +3844,20 @@ msgstr ""
 msgid "Copy all settings from one channel to another"
 msgstr "Kopiëer alle instellingen van het ene kanaal naar het andere"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 msgid "Created"
 msgstr "Gemaakt"
 
-#: modules/commands/cs_entrymsg.cpp:116 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 msgid "Creator"
 msgstr "Door"
 
@@ -3918,8 +3918,8 @@ msgstr "DEL [nick] vingerafdruk"
 msgid "DEL [nickname] mask"
 msgstr "DEL [nick] masker"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL {masker | nr | lijst | id}"
 
@@ -4226,8 +4226,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr "Depooled %s."
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -4706,7 +4706,7 @@ msgstr "Einde van verbodslijst."
 msgid "End of list - %d channels shown."
 msgstr "Einde van lijst - %d kanalen weergegeven."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Einde van lijst - %d/%d overeenkomsten weergegeven."
@@ -4854,10 +4854,10 @@ msgstr "Uitzondering voor %s is geüpdatet naar %d."
 
 #: modules/pseudoclients/nickserv.cpp:535
 #: modules/pseudoclients/nickserv.cpp:540
-#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:315 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 msgid "Expires"
 msgstr "Verloopt"
 
@@ -5232,7 +5232,7 @@ msgstr "Sleutel voor kanaal %s is %s."
 msgid "Kick a user from a channel"
 msgstr "Kick een gebruiker uit een kanaal"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr "%d/%d gebruikers gekickd die overeenstemden met %s uit %s."
@@ -5271,8 +5271,8 @@ msgstr "LIMIT afgedwongen op %s, %d gebruikers werden verwijderd."
 msgid "LIST threshold"
 msgstr "LIST aantal"
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 msgid "LIST [mask | list | id]"
 msgstr "LIST [masker | lijst | id]"
 
@@ -5280,8 +5280,8 @@ msgstr "LIST [masker | lijst | id]"
 msgid "LIST [mask | list]"
 msgstr "LIST [masker | lijst]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 msgid "LIST [nickname]"
 msgstr "LIST [nick]"
 
@@ -5302,7 +5302,7 @@ msgstr "Laatste memo naar %s is geannuleerd."
 msgid "Last quit message"
 msgstr "Laatste quit-bericht"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 msgid "Last seen"
 msgstr "Laatst gezien"
 
@@ -5314,7 +5314,7 @@ msgstr "Laatst bekende adres"
 msgid "Last topic"
 msgstr "Laatste topic"
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 msgid "Last used"
 msgstr "Laatst gebruikt"
 
@@ -5342,8 +5342,8 @@ msgstr "Niveau voor %s op kanaal %s gewijzigd naar enkel-stichter."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Niveau moet tussen de %d en %d inclusief zijn."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr "Limiet"
 
@@ -5365,7 +5365,7 @@ msgstr "Lijst voor mode %c is vol."
 msgid "List loaded modules"
 msgstr "Geef geladen modules weer"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, c-format
 msgid "List of entries matching %s:"
 msgstr "Lijst van vermeldingen overeenstemmend met %s:"
@@ -5963,15 +5963,15 @@ msgstr "Beheer het DefCon systeem"
 msgid "Manipulate the topic of the specified channel"
 msgstr "Pas de topic van het gegeven kanaal aan"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr "Masker"
 
@@ -5984,8 +5984,8 @@ msgstr "Masker %s bestaat al op %s's toegangslijst."
 msgid "Mask must be in the form user@host."
 msgstr "Masker moet in het ident@host formaat zijn."
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 msgid "Masks and unregistered users may not be on access lists."
 msgstr ""
 "Maskers en ongeregistreerde gebruikers mogen niet op toegangslijsten staan."
@@ -6033,7 +6033,7 @@ msgstr "Memolimiet voor %s veranderd naar %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Memolimiet voor %s veranderd naar 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo verstuurd naar %s."
@@ -6154,7 +6154,7 @@ msgstr "Wijzig de lijst van %s's"
 msgid "Modify the list of authorized addresses"
 msgstr "Wijzig de lijst met toegestane adressen"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 msgid "Modify the list of privileged users"
 msgstr "Wijzig de lijst van gebruikers met privileges"
 
@@ -6209,10 +6209,10 @@ msgstr "Module: %s Versie: %s Auteur: %s Geladen: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr "Naam"
 
@@ -6229,8 +6229,8 @@ msgstr "Netwerkstatistieken voor %s:"
 msgid "Never"
 msgstr "Nooit"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
 #: modules/commands/ns_group.cpp:315
 msgid "Nick"
 msgstr "Nick"
@@ -6416,8 +6416,8 @@ msgstr "Geen overeenkomsten voor %s gevonden."
 msgid "No matching entries on %s %s list."
 msgstr "Geen overeenkomsten op %s %s lijst."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Geen overeenkomsten op %s toegangslijst."
@@ -6488,8 +6488,8 @@ msgstr "Geen aanvraag voor nick %s gevonden."
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr "Geen ondertekende kicks wanneer SIGNKICK LEVEL gebruikt word"
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, c-format
 msgid "No stats for %s."
 msgstr "Geen statistieken voor %s."
@@ -6499,7 +6499,7 @@ msgstr "Geen statistieken voor %s."
 msgid "No such info \"%s\" on %s."
 msgstr "Geen zulke info \"%s\" over %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, c-format
 msgid "No users on %s match %s."
 msgstr "Geen gebruikers op %s die overeenkomen met %s."
@@ -6527,17 +6527,17 @@ msgstr "Geen"
 msgid "Nothing to do."
 msgstr "Niets te doen."
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:116
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr "Nummer"
 
@@ -6719,7 +6719,7 @@ msgid "Please wait %d seconds before requesting a new vHost."
 msgstr ""
 "Gelieve %d seconden te wachten alvorens een nieuwe vHost aan te vragen."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
@@ -6782,8 +6782,8 @@ msgstr "Voorkom dat de nick verloopt"
 msgid "Prevents users being kicked by Services"
 msgstr "Voorkomt dat gebruikers gekickt worden door Services"
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privé"
 
@@ -6903,11 +6903,11 @@ msgstr "Lees een of meerdere memo's"
 msgid "Real name"
 msgstr "Echte naam"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr "Reden"
 
@@ -6940,13 +6940,13 @@ msgstr "Verander de betekenissen van toegangsniveaus"
 msgid "Regains control of your nick"
 msgstr "Neemt de controle van je nick weer over"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 msgid "Regex is disabled."
 msgstr "Regex is uitgeschakeld."
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -6956,8 +6956,8 @@ msgstr ""
 "Omsluit het masker met // indien dit gewenst is."
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -8184,7 +8184,7 @@ msgstr "Ondertekende kicks-optie voor %s is nu aan."
 msgid "Signed kicks"
 msgstr "Ondertekende kicks"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr ""
@@ -8199,12 +8199,12 @@ msgstr "Sorry, ik heb %s niet gezien."
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Sorry, bot toewijzing is tijdelijk uitgeschakeld."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Sorry, bot wijzigingen zijn tijdelijk uitgeschakeld."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Sorry, bot opties instellen is tijdelijk uitgeschakeld."
 
@@ -8214,7 +8214,7 @@ msgstr "Sorry, bot opties instellen is tijdelijk uitgeschakeld."
 msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr "Sorry, kanaal %s lijst wijzigingen zijn tijdelijk uitgeschakeld."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Sorry, kanaal toegangslijst wijzigingen zijn tijdelijk uitgeschakeld."
 
@@ -8275,8 +8275,8 @@ msgstr "Sorry, de maximum van %d autojoinvermeldingen is bereikt."
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Sorry, de maximum van %d certificaten is bereikt."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -9895,8 +9895,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "Ontlaad een module"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Kan regex engine %s niet vinden."
@@ -10107,8 +10107,8 @@ msgstr "vHost voor groep %s gewijzigd naar %s@%s."
 msgid "VIEW host"
 msgstr "VIEW host"
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 msgid "VIEW [mask | list | id]"
 msgstr "VIEW [masker | lijst | id]"
 
@@ -10253,7 +10253,7 @@ msgstr "Woord"
 msgid "You are already a member of the group of %s."
 msgstr "Je bent al lid van de groep van %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Je bent al geïdentificeerd."
 
@@ -10356,8 +10356,8 @@ msgstr ""
 msgid "You can't %s yourself!"
 msgstr "Je kan geen %s doen op jezelf!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 msgid "You can't add a channel to its own access list."
 msgstr "Je kan geen kanaal toevoegen op zijn eigen toegangslijst."
 
@@ -10890,8 +10890,8 @@ msgstr "[nick]"
 msgid "[nickname [REVALIDATE]]"
 msgstr "[nickname [REVALIDATE]]"
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 msgid "[nickname]"
 msgstr "[nick]"
 
@@ -10911,7 +10911,7 @@ msgstr "[+verlooptijd] kanaal reden"
 msgid "[Hostname hidden]"
 msgstr "[host verborgen]"
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr "[geschorst]"
 
@@ -11073,6 +11073,6 @@ msgstr "{kanaal | nick}"
 msgid "{nick | channel}"
 msgstr "{nick | kanaal}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 msgid "{nick | channel} memo-text"
 msgstr "{nick | kanaal} memo-tekst"
diff --git a/language/anope.pl_PL.po b/language/anope.pl_PL.po
index 531272599..ccea4cb1b 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 20:57-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Polish\n"
@@ -61,7 +61,7 @@ msgstr "%s dodano do listy zakazanych słów kanału %s."
 msgid "%s added to %s's access list."
 msgstr "%s dodano do Twojej listy dostępu."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s dodano do Twojej listy dostępu."
@@ -81,11 +81,6 @@ msgstr "%s dodano do listy AKILL."
 msgid "%s added to the AKILL list."
 msgstr "%s dodano do listy AKILL."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "%s dodano do Twojej listy dostępu."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -117,7 +112,7 @@ msgstr ""
 "Aby uzyskać szczegółowy opis polecenia wpisz:\n"
 "/msg %s HELP komenda"
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -134,7 +129,7 @@ msgstr ""
 "Aby uzyskać szczegółowy opis polecenia wpisz:\n"
 "/msg %s HELP komenda"
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -225,7 +220,7 @@ msgstr "%s usunięto z listy zakazanych słów kanału %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s usunięto z listy dostępu kanału %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s usunięto z Twojej listy dostępu."
@@ -245,11 +240,6 @@ msgstr "%s usunięto z listy AOP kanału %s."
 msgid "%s deleted from the AKILL list."
 msgstr "%s usunięto z listy AKILL."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s usunięto z Twojej listy dostępu."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -336,7 +326,7 @@ msgstr "%s dodano do Twojej listy dostępu."
 msgid "%s is already suspended."
 msgstr "Przebywasz już na kanale %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s nie jest prawidłową nazwą bota lub kanału."
@@ -403,7 +393,7 @@ msgstr "%s dodano do listy AKICK kanału %s."
 msgid "%s not found on %s %s list."
 msgstr "%s nie znaleziono na liście AOP kanału %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s nie znaleziono na liście dostępu kanału %s."
@@ -423,7 +413,7 @@ msgstr "%s nie znaleziono na liście zakazanych słów kanału %s."
 msgid "%s not found on %s's access list."
 msgstr "%s nie znaleziono na liście dostępu kanału %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s nie znaleziono na Twojej liście dostępu."
@@ -590,6 +580,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP nazwa hasło"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -599,11 +594,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET nick AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP kanał"
@@ -633,8 +628,8 @@ msgstr "BAN #kanał nick [powód]"
 msgid "channel modes"
 msgstr "MODE kanał flagi"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN kanał [nick]"
@@ -678,7 +673,7 @@ msgstr "MODE kanał flagi"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE kanał flagi"
@@ -697,9 +692,9 @@ msgstr "BAN #kanał nick [powód]"
 msgid "channel APPEND topic"
 msgstr "TOPIC kanał [temat]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP kanał"
@@ -714,12 +709,12 @@ msgstr "TOPIC kanał [temat]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP kanał"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE kanał flagi"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [kanał] {numer | list | ALL}"
@@ -738,7 +733,7 @@ msgstr "DEL [kanał] {numer | list | ALL}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP kanał"
@@ -748,8 +743,8 @@ msgstr "DROP kanał"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP kanał {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP kanał {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
@@ -796,12 +791,12 @@ msgstr "AOP kanał {ADD|DEL|LIST|CLEAR} [nick | pozycja]"
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [kanał] {numer | list | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER kanał opis"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN kanał [nick]"
@@ -831,8 +826,8 @@ msgstr "BAN #kanał nick [powód]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP kanał"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET kanał XOP {ON | OFF}"
@@ -869,13 +864,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET kanał SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET kanał XOP {ON | OFF}"
@@ -884,7 +879,7 @@ msgstr "SET kanał XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE numer"
@@ -899,8 +894,8 @@ msgstr "STAFF treść wiadomości"
 msgid "message"
 msgstr "GLOBAL treść wiadomości"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -913,10 +908,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP nazwa hasło"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO nick"
@@ -946,13 +941,13 @@ msgstr "SVSNICK nick nowy-nick"
 msgid "nick [reason]"
 msgstr "BAN #kanał nick [powód]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK nick"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID nick powód"
@@ -962,7 +957,7 @@ msgstr "FORBID nick powód"
 msgid "nickname email"
 msgstr "FORBID nick powód"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID nick powód"
@@ -1002,15 +997,15 @@ msgstr "FORBID nick powód"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET nick AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nick KILL {ON | QUICK | IMMED | OFF}"
@@ -1079,11 +1074,6 @@ msgstr "LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE serwer [powód]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP nazwa hasło"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1094,7 +1084,7 @@ msgstr "MODE kanał flagi"
 msgid "user [reason]"
 msgstr "JUPE serwer [powód]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1220,7 +1210,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR usuwa wszystkie wpisy z listy AKILL."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1351,7 +1341,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1729,7 +1719,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1784,7 +1774,7 @@ msgstr "%d boty(ów) dostępnych."
 msgid "%d modules loaded."
 msgstr "Załadowanych modułów: %d."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nicków w grupie."
@@ -1887,9 +1877,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "       Kopanie za capsa: %s (minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista dostępu kanału %s jest pusta."
@@ -1921,8 +1911,8 @@ msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr ""
 "%s nie może być zastępcą na kanale %s, ponieważ jest jego właścicielem."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Komendy %s:"
@@ -2195,7 +2185,7 @@ msgstr "Lista AKICK kanału %s jest pusta."
 msgid "%s's auto join list:"
 msgstr "    AKICK       Zarządza listą AKICK"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Twoja lista dostępu jest pusta."
@@ -2301,7 +2291,7 @@ msgstr "%s jest teraz online."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2367,17 +2357,17 @@ msgstr "CHANKILL [+czas-trwania] {#kanał} [powód]"
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+czas-trwania] {#kanał} [powód]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID nick powód"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+czas-trwania] {#kanał} [powód]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID nick powód"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+czas-trwania] {#kanał} [powód]"
@@ -2463,7 +2453,7 @@ msgstr "Ustawienia poziomów dostępu kanału %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Poziomy dostępu kanału %s zostały zresetowane do domyślnych."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "Lista dostępu dla %s:"
@@ -2601,7 +2591,7 @@ msgstr "Wszystkie wiadomości kanału %s zostały usunięte."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2634,12 +2624,12 @@ msgstr "Wszystkie vhosty w grupie %s zostały zmienione na %s"
 msgid "All user modes on %s have been synced."
 msgstr "Wszystkie O:linie %s zostały zresetowane."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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"
@@ -3072,7 +3062,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3086,7 +3076,7 @@ msgstr ""
 "włączona serwisy będą wysyłać wiadomości prywatne\n"
 "w przeciwnym wypadku będą wysyłać powiadomienia."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3248,12 +3238,12 @@ msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
 msgid "Associate oper info with a nick or channel"
 msgstr "    ASSIGN         Przydziela bota na kanał"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      Przypisuje adres e-mail do nicka"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3266,7 +3256,7 @@ msgstr ""
 "będzie wyświetlany przy opisie Twojego nicka\n"
 "dostępnym przy użyciu komendy INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "AUTOOP"
 
@@ -3579,8 +3569,8 @@ msgstr "Bot nie będzie kopał za flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Bot nie będzie kopał za powtórzenia."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3623,7 +3613,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Bot będzie teraz kopał operatorów na kanale %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Nie mogę wysłać teraz maila. Spróbuj za chwilę."
 
@@ -3691,7 +3681,7 @@ msgstr ""
 "\n"
 "Wymusza natychmiastowy zapis baz danych na dysku."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Lista dostępu dla %s:"
@@ -3705,7 +3695,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s zmienia Twoje flagi użytkownika."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr "    MSG        Zmienia sposób komunikacji serwisów"
@@ -3755,7 +3745,7 @@ msgstr ""
 "Zmienia właściciela kanału.\n"
 "Nowy nick musi być zarejestrowany."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3770,7 +3760,7 @@ msgstr ""
 "wysłaną przez Ciebie komendę). Numer może być \n"
 "wybrany z poniższej listy obsługiwanych języków:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3819,7 +3809,7 @@ msgstr ""
 "Jeżeli spadkobierca jest właścicielem zbyt dużej\n"
 "liczby kanałów (%d) to kanał zostanie odrejestrowany."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP kanał"
@@ -3904,7 +3894,7 @@ msgstr "Kanał %s nie wygaśnie."
 msgid "Channel %s %s list has been cleared."
 msgstr "Lista AOP kanału %s została wyczyszczona."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista dostępu kanału %s została wyczyszczona."
@@ -3941,8 +3931,8 @@ msgstr ""
 "Kanały, na których %s jest na liście dostępu:\n"
 "  Nr   Kanał              Poziom    Opis"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s nie znaleziono na liście dostępu kanału %s."
@@ -4122,7 +4112,7 @@ msgstr "    CONFIRM     Potwierdza rejestrację nicka"
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  Usuwa wszystkie flagi z kanału"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4141,21 +4131,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN       Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "    Utworzony: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "    Utworzony: %s"
@@ -4214,7 +4204,7 @@ msgstr "GROUP nazwa hasło"
 msgid "DEL [nickname] channel"
 msgstr "MODE kanał flagi"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID nick powód"
@@ -4224,8 +4214,8 @@ msgstr "FORBID nick powód"
 msgid "DEL [nickname] mask"
 msgstr "MODE kanał flagi"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [kanał] {numer | list | ALL}"
@@ -4551,8 +4541,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "Opis kanału %s został zmieniony na %s."
@@ -4713,12 +4703,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Adres e-mail osoby %s został zmieniony na %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Adres e-mail osoby %s został usunięty."
@@ -4805,7 +4795,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4842,14 +4832,14 @@ msgstr ""
 "temat za każdym razem, gdy na kanał będzie wchodzić\n"
 "pierwsza osoba."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5060,7 +5050,7 @@ msgstr "Koniec listy kanałów."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Koniec listy użytkowników."
@@ -5080,7 +5070,7 @@ msgstr "Koniec listy użytkowników."
 msgid "End of list - %d channels shown."
 msgstr "Koniec listy - %d/%d wpisów wyświetlono."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Koniec listy - %d/%d wpisów wyświetlono."
@@ -5115,37 +5105,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Polski"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Wiadomość powitalna osoby %s została usunięta."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Komendy fantasy na kanale %s zostały włączone."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Wiadomość powitalna osoby %s została zmieniona na %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Lista dostępu dla %s jest pusta."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "Lista dostępu dla %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Wszystkie wiadomości kanału %s zostały usunięte."
@@ -5169,7 +5159,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5195,12 +5185,12 @@ msgstr "Wyjątek dla %s (#%d) przeniesiono na pozycję %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "Wyjątek dla %s został zaktualizowany do %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "        Wygasa: %s"
@@ -5215,7 +5205,7 @@ msgstr "Wyjątek dla %s został zaktualizowany do %d."
 msgid "Expiry for %s updated."
 msgstr "Zmieniono czas wygasania %s."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "FANTASY"
 
@@ -5234,11 +5224,16 @@ msgstr "Komendy fantasy na kanale %s zostały włączone."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER     Usuwa twój status właściciela kanału"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "Maska %s jest już w Twojej liście dostępu."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "Przebywasz już na kanale %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5474,12 +5469,12 @@ msgstr "Lista ignorowanych jest pusta."
 msgid "Ignore list:"
 msgstr "Lista botów:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "DONTKICKVOICES"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "  Adres e-mail: %s"
@@ -5566,17 +5561,17 @@ msgstr "        Italics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP       Dołącza nick do wskazanej grupy"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "MSG"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Opcja PEACE dla kanału %s została włączona."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Opcja PEACE dla kanału %s została włączona."
@@ -5595,7 +5590,7 @@ msgstr "Kluczem do kanału %s jest %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Wyrzuca użytkownika z kanału"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5638,8 +5633,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [kanał] [lista | NEW]"
@@ -5649,8 +5644,8 @@ msgstr "LIST [kanał] [lista | NEW]"
 msgid "LIST [mask | list]"
 msgstr "LIST [kanał] [lista | NEW]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK nick"
@@ -5661,7 +5656,7 @@ msgstr ""
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]\n"
 "LOGONNEWS {ADD|DEL|LIST} [tekst|numer]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Język został zmieniony na Polski."
 
@@ -5675,7 +5670,7 @@ msgstr "Ostatnia wiadomość do %s została odwołana."
 msgid "Last quit message"
 msgstr "  Ostatni QUIT: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "      Widziano: %s"
@@ -5689,7 +5684,7 @@ msgstr "  Ostatni host: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "      Widziano: %s"
@@ -5721,8 +5716,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Poziom musi być pomiędzy %d a %d włącznie."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5746,17 +5741,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     Listuje załadowane moduły"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista nicków grupy %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista nicków grupy %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Lista nicków w grupie:"
 
@@ -5810,7 +5805,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "Lista nicków w grupie:"
@@ -6298,7 +6293,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Nie możesz usuwać adresu e-mail w tej sieci."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6333,15 +6328,15 @@ msgstr "    DEFCON      Modyfikuje poziom systemu DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC       Zmienia temat podanego kanału"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6354,8 +6349,8 @@ msgstr "Maska %s jest już w Twojej liście dostępu."
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "Maska %s jest już w Twojej liście dostępu."
@@ -6407,7 +6402,7 @@ msgstr "Limit wiadomości dla %s zmieniono na %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Limit wiadomości dla %s ustawiono na 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Wiadomość została wysłana do %s."
@@ -6417,12 +6412,12 @@ msgstr "Wiadomość została wysłana do %s."
 msgid "Memos for %s:"
 msgstr "Blokowane tryby: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL treść wiadomości"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "MSG"
 
@@ -6503,7 +6498,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Wyświetla aktualną listę dostępu."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6528,12 +6523,12 @@ msgstr "    AOP         Zarządza listą AOP (operatorów)"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS      Zarządza listą dostępu"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS      Zarządza listą dostępu"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Zarządza listą ignorowanych przez serwisy"
@@ -6587,10 +6582,10 @@ msgstr "Moduł: %s Wersja: %s Autor: %s Załadowano: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Moduł: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6607,9 +6602,9 @@ msgstr "Lista dostępu dla %s:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO nick"
@@ -6674,12 +6669,12 @@ msgstr "Nick %s został zarejestrowany."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s został skrócony do %d znaków."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s od teraz podlega zasadom wygasania."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s nie wygaśnie."
@@ -6694,7 +6689,7 @@ msgstr "%s nie posiada wiadomości od Ciebie."
 msgid "Nick %s has been logged out."
 msgstr "Nick %s został wylogowany."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6704,7 +6699,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s został zawieszony."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6744,17 +6739,17 @@ msgstr "Kanał %s jest już zarejestrowany!"
 msgid "Nickname %s may not be registered."
 msgstr "Kanału %s nie można rejestrować."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "Nick %s został zarejestrowany z maską: %s."
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nick %s został zarejestrowany."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "AUTOOP"
@@ -6763,7 +6758,7 @@ msgstr "AUTOOP"
 msgid "No bot"
 msgstr "NOBOT"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "nie wygasa"
@@ -6797,8 +6792,8 @@ msgstr "Nie ma użytkowników z adresem e-mail %s."
 msgid "No matching entries on %s %s list."
 msgstr "Nie znaleziono wpisów w liście AOP kanału %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Nie znaleziono wpisów na liście dostępu kanału %s."
@@ -6869,8 +6864,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Lista dostępu dla %s:"
@@ -6880,7 +6875,7 @@ msgstr "Lista dostępu dla %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Zmieniono flagi użytkownika dla %s."
@@ -6908,17 +6903,17 @@ msgstr "Brak"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7044,12 +7039,12 @@ msgstr "Hasło dla %s to %s."
 msgid "Password incorrect."
 msgstr "Nieprawidłowe hasło."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "PEACE"
 
@@ -7063,7 +7058,7 @@ msgstr "Opcja PEACE dla kanału %s została włączona."
 msgid "Peace option for %s is now on."
 msgstr "Opcja PEACE dla kanału %s została włączona."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7099,17 +7094,17 @@ msgstr "Proszę odczekać %d sekund(y) i ponowić próbę."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Odczekaj %d sekund(y) przed ponownym użyciem komendy SEND."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Odczekaj %d sekund(y) przed ponownym użyciem komendy SEND."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Odczekaj %d sekund przed ponownym użyciem komendy GROUP."
 
-#: modules/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Odczekaj %d sekund przed ponownym użyciem komendy REGISTER."
@@ -7157,7 +7152,7 @@ msgstr ""
 "    PRIVATE    Zapobiega wyświetlaniu nicka po wydaniu\n"
 "               polecenia: /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Zapobiega wygaśnięciu nicka"
@@ -7166,8 +7161,8 @@ msgstr "    NOEXPIRE   Zapobiega wygaśnięciu nicka"
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "PRIVATE"
 
@@ -7211,26 +7206,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "KILL"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Ochrona dla %s jest teraz włączona."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Ochrona dla %s ze zredukowanym opóźnieniem jest teraz włączona."
 
-#: modules/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Natychmiastowa ochrona dla %s jest teraz włączona"
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Ochrona dla %s jest teraz włączona."
@@ -7248,7 +7243,7 @@ msgstr ""
 "Na listę zostają dodane prawdziwe adresy (ident@host),\n"
 "po czym AKILL zostaje wykonany."
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "DONTKICKVOICES"
@@ -7294,11 +7289,11 @@ msgstr "    READ        Wyświetla jedną lub więcej wiadomości"
 msgid "Real name"
 msgstr "\tNazwa: %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7327,14 +7322,14 @@ msgstr "    LEVELS      Zarządza poziomami dostępu"
 msgid "Regains control of your nick"
 msgstr "    RELEASE     Zwalnia nick po użyciu komendy RECOVER"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s jest włączone"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7342,8 +7337,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7419,7 +7414,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7517,7 +7512,7 @@ msgstr "    MODLOAD     Ładuje moduł"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Ładuje na nowo plik konfiguracyjny"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7595,7 +7590,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Ładuje na nowo plik konfiguracyjny"
@@ -7605,7 +7600,7 @@ msgstr "    RELOAD      Ładuje na nowo plik konfiguracyjny"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Ogranicza dostęp do kanału"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "RESTRICTED"
@@ -7750,12 +7745,12 @@ msgstr "NOOP {SET|REVOKE} serwer"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Hasło przyjęte - jesteś zidentyfikowany(a)."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Hasło przyjęte - jesteś zidentyfikowany(a)."
@@ -7778,7 +7773,7 @@ msgstr "    RESTART     Zapisuje bazy i restartuje serwisy"
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "SECUREFOUNDER"
@@ -7793,7 +7788,7 @@ msgstr "Status właściciela kanału %s będzie teraz chroniony."
 msgid "Secure founder option for %s is now on."
 msgstr "Status właściciela kanału %s będzie teraz chroniony."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "SECUREOPS"
@@ -7818,12 +7813,12 @@ msgstr "Opcja bezpieczeństwa dla kanału %s została włączona."
 msgid "Secure option for %s is now on."
 msgstr "Opcja bezpieczeństwa dla kanału %s została włączona."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Opcja bezpieczeństwa dla %s została włączona."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Opcja bezpieczeństwa dla %s została włączona."
@@ -7833,7 +7828,7 @@ msgstr "Opcja bezpieczeństwa dla %s została włączona."
 msgid "Secureops enforced on %s."
 msgstr "Opcja bezpieczeństwa dla %s została włączona."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "SECURE"
 
@@ -7889,7 +7884,7 @@ msgstr "SECUREFOUNDER"
 msgid "Sends a memo and requests a read receipt"
 msgstr "    RSEND       Wysyła wiadomość z żądaniem potwierdzenia odbioru"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8155,12 +8150,12 @@ msgstr ""
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Serwisy będą automatycznie nadawały uprawnienia dla użytkownika %s."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Serwisy będą teraz wysyłać do %s wiadomości."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Serwisy będą teraz wysyłać do %s powiadomienia."
@@ -8233,7 +8228,7 @@ msgstr "    DISPLAY    Ustawia nick reprezentujący grupę nicków"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       Ustawia nick właściciela kanału"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8635,7 +8630,7 @@ msgstr ""
 "Włącza lub wyłącza automatyczne nadawanie uprawnień\n"
 "wskazanemu użytkownikowi przy wchodzeniu na kanał."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8726,11 +8721,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Podpisywanie komendy KICK na kanale %s zostało włączone."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "SIGNKICK"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s ma zbyt dużo wiadomości i nie może otrzymywać nowych."
@@ -8745,12 +8740,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Konfigurowanie bota jest tymczasowo wyłączone."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Modyfikacja botów jest tymczasowo wyłączona."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Konfigurowanie bota jest tymczasowo wyłączone."
 
@@ -8760,7 +8755,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/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Modyfikacja listy dostępu jest tymczasowo wyłączona."
 
@@ -8797,7 +8792,7 @@ msgstr "Ustawianie opcji wiadomości jest tymczasowo wyłączone."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Usuwanie nicków jest tymczasowo wyłączone."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Grupowanie nicków jest tymczasowo wyłączone."
 
@@ -8815,13 +8810,13 @@ msgstr "Możesz mieć tylko %d wpisów na kanałowej liście dostępu."
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Możesz mieć tylko %d wpisy(ów) na liście dostępu."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8961,7 +8956,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Synchronizuje vhosty wszystkich nicków w grupie"
@@ -8970,7 +8965,7 @@ msgstr "    GROUP       Synchronizuje vhosty wszystkich nicków w grupie"
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8981,7 +8976,7 @@ msgstr ""
 "\n"
 "Listuje wszystkie nicki z Twojej grupy."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9216,7 +9211,7 @@ msgstr ""
 "przed ich użyciem. Hasłem jest to samo hasło, \n"
 "którego użyto przy komendzie REGISTER."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9403,21 +9398,21 @@ msgstr ""
 "Aby dowiedzieć się jak włączyć tryb xOP wpisz:\n"
 "/msg %s HELP SET XOP"
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9425,13 +9420,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "Opcja IMMED nie jest jest dostępna w tej sieci."
 
@@ -9513,7 +9508,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9594,7 +9589,17 @@ msgstr ""
 "zdefiniowanych ograniczeń dla serwisów podczas\n"
 "próby ataku na sieć."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Wiadomość powitalna osoby %s została usunięta."
@@ -9603,15 +9608,6 @@ msgstr "Wiadomość powitalna osoby %s została usunięta."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9744,7 +9740,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "Jest %d wiadomości dla kanału %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Usuwa vhosty wszystkich nicków w grupie"
@@ -9840,7 +9836,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -9852,7 +9848,7 @@ msgstr ""
 "To polecenie pozwala ustawić vhost bieżącego nicka\n"
 "dla wszystkich nicków w grupie."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9931,7 +9927,7 @@ msgstr ""
 "\n"
 "To polecenie ładuje wskazany moduł z katalogu modułów."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10002,7 +9998,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10044,7 +10040,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10068,7 +10064,7 @@ msgstr ""
 "\n"
 "To polecenie ładuje wskazany moduł z katalogu modułów."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10194,12 +10190,12 @@ msgstr "Wyłącz CAPS LOCKa!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     Włącza lub wyłącza bezpieczeństwo nicka"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     Włącza lub wyłącza bezpieczeństwo nicka"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       Włącza lub wyłącza ochronę nicka"
@@ -10238,7 +10234,7 @@ msgstr ""
 "Jednak każdy, kto zna nick może uzyskać o nim\n"
 "informacje używając polecenia INFO."
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10269,7 +10265,7 @@ msgstr "    SECURE     Włącza lub wyłącza bezpieczeństwo nicka"
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     Włącza lub wyłącza bezpieczeństwo nicka"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10302,7 +10298,7 @@ msgstr ""
 "należy stosować z rozwagą). Administrator sieci \n"
 "może wyłączyć korzystanie z IMMED."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10379,7 +10375,7 @@ msgstr ""
 "Aby uzyskać więcej informacji o danej opcji wpisz:\n"
 "/msg %s HELP SET opcja"
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10394,8 +10390,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Wyładowuje moduł"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Nie można wyładować modułu %s"
@@ -10620,8 +10616,8 @@ msgstr "Vhosty dla grupy %s zostały zmienione na %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [kanał] [lista | NEW]"
@@ -10771,12 +10767,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Należysz już do grupy %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Jesteś już zidentyfikowany(a)."
 
@@ -10804,6 +10800,11 @@ msgstr "Nie możesz zmieniać swojego limitu wiadomości."
 msgid "You are not permitted to change your memo limit."
 msgstr "Nie możesz zmieniać swojego limitu wiadomości."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Jesteś już zidentyfikowany(a)."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10813,7 +10814,7 @@ msgstr "Jesteś teraz super-administratorem."
 msgid "You are now an IRC Operator."
 msgstr "Jesteś teraz IRC operatorem."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -10877,8 +10878,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Nie możesz usunąć samego siebie!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Nie znaleziono wpisów na liście dostępu kanału %s."
@@ -10888,7 +10889,7 @@ msgstr "Nie znaleziono wpisów na liście dostępu kanału %s."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Nie mogę wylogować %s, bo to administrator serwisów."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "Nie możesz usuwać adresu e-mail w tej sieci."
@@ -10903,7 +10904,7 @@ msgstr "Nie możesz ustawić limitu wiadomości dla %s większego niż %d."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Nie możesz ustawić swojego limitu wiadomości większego niż %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Nie możesz usuwać adresu e-mail w tej sieci."
 
@@ -10974,7 +10975,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Napisz /msg %s READ %d aby przeczytać."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "Zostałeś zaproszony do %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "Zostałeś zaproszony do %s."
@@ -11033,11 +11039,16 @@ msgstr "    DELALL      Usuwa vhosty wszystkich nicków w grupie"
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "Nie możesz usuwać adresu e-mail w tej sieci."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "Nie możesz usuwać adresu e-mail w tej sieci."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11064,7 +11075,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "Nie mogę wylogować %s, bo to administrator serwisów."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11095,7 +11106,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -11106,7 +11117,7 @@ msgstr ""
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11115,11 +11126,6 @@ msgstr ""
 "Teraz ustaw adres e-mail dla Twojego nicka.\n"
 "Gdy zapomnisz hasła, zostanie ono wysłane na e-mail."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s nie jest prawidłowym rodzajem bana."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11180,17 +11186,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Bot %s został usunięty."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "Jesteś już zidentyfikowany(a)."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Jesteś już zidentyfikowany(a)."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Adres e-mail osoby %s został zmieniony na %s."
@@ -11200,7 +11206,7 @@ msgstr "Adres e-mail osoby %s został zmieniony na %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Wszystkie O:linie %s zostały usunięte."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11257,12 +11263,12 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Twój nick został pomyślnie wylogowany."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr "Twój nick jest już zarejestrowany. Napisz najpierw: /msg %s DROP"
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11271,7 +11277,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Nick %s został zarejestrowany."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Twój nick został zmieniony na %s."
@@ -11280,12 +11286,12 @@ msgstr "Twój nick został zmieniony na %s."
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Twój kod rejestracyjny został ponownie wysłany na %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Twoje hasło do nicka to %s"
@@ -11294,7 +11300,7 @@ msgstr "Twoje hasło do nicka to %s"
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
@@ -11415,7 +11421,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {nick | kanał}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO nick"
@@ -11424,8 +11430,8 @@ msgstr "INFO nick"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK nick"
@@ -11447,7 +11453,7 @@ msgstr "CHANKILL [+czas-trwania] {#kanał} [powód]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11616,7 +11622,7 @@ msgstr "UNBAN kanał [nick]"
 msgid "{nick | channel}"
 msgstr "CANCEL {nick | kanał}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | kanał} treść"
diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po
index 53955fc3b..da4f93314 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 21:02-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Portuguese\n"
@@ -57,7 +57,7 @@ msgstr "%s adicionado na lista de palavrões do %s."
 msgid "%s added to %s's access list."
 msgstr "%s adicionado em sua lista de acesso."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s adicionado em sua lista de acesso."
@@ -77,11 +77,6 @@ msgstr "%s adicionado à lista de AKILL."
 msgid "%s added to the AKILL list."
 msgstr "%s adicionado à lista de AKILL."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "%s adicionado em sua lista de acesso."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -112,7 +107,7 @@ msgstr ""
 "/msg %s comando. Para informações mais específicas\n"
 "sobre um comando, digite /msg %s HELP comando."
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -128,7 +123,7 @@ msgstr ""
 "/msg %s comando. Para mais informações sobre um\n"
 "comando específico, digite /msg %s HELP comando."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -218,7 +213,7 @@ msgstr "%s removido da lista de palavrões do %s."
 msgid "%s deleted from %s's access list."
 msgstr "%s removido da lista de acesso do %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s removido da sua lista de acesso."
@@ -238,11 +233,6 @@ msgstr "%s deletado da lista de AOP do %s."
 msgid "%s deleted from the AKILL list."
 msgstr "%s removido da lista de AKILL."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s removido da sua lista de acesso."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -326,7 +316,7 @@ msgstr "%s adicionado em sua lista de acesso."
 msgid "%s is already suspended."
 msgstr "You are already in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s não é um bot válido ou um canal registrado."
@@ -393,7 +383,7 @@ msgstr "%s adicionado à lista de akick do %s."
 msgid "%s not found on %s %s list."
 msgstr "Nick %s não encontrado na lista de AOP do %s."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s não foi encontrado na lista de acesso do %s."
@@ -413,7 +403,7 @@ msgstr "%s não foi encontrado na lista de palavrões do %s."
 msgid "%s not found on %s's access list."
 msgstr "%s não foi encontrado na lista de acesso do %s."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s não foi encontrado em sua lista de acesso."
@@ -590,6 +580,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP alvo senha"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -599,11 +594,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP canal"
@@ -633,8 +628,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel modes"
 msgstr "MODE canal modos"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN canal [nick]"
@@ -678,7 +673,7 @@ msgstr "MODE canal modos"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE canal modos"
@@ -697,9 +692,9 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel APPEND topic"
 msgstr "TOPIC canal [tópico]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP canal"
@@ -714,12 +709,12 @@ msgstr "TOPIC canal [tópico]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP canal"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE canal modos"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [canal] {núm | list | ALL}"
@@ -738,7 +733,7 @@ msgstr "DEL [canal] {núm | list | ALL}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP canal"
@@ -748,8 +743,8 @@ msgstr "DROP canal"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
@@ -796,12 +791,12 @@ msgstr "AOP canal {ADD|DEL|LIST|CLEAR} [nick | entrada]"
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [canal] {núm | list | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER canal descrição"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN canal [nick]"
@@ -831,8 +826,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP canal"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET canal XOP {ON | OFF}"
@@ -869,13 +864,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET canal SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET canal XOP {ON | OFF}"
@@ -884,7 +879,7 @@ msgstr "SET canal XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE número"
@@ -899,8 +894,8 @@ msgstr "STAFF memo-text"
 msgid "message"
 msgstr "GLOBAL mensagem"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -913,10 +908,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP alvo senha"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO nick"
@@ -946,13 +941,13 @@ msgstr "SVSNICK nick novonick "
 msgid "nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK nick"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID nick motivo"
@@ -962,7 +957,7 @@ msgstr "FORBID nick motivo"
 msgid "nickname email"
 msgstr "FORBID nick motivo"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID nick motivo"
@@ -1002,15 +997,15 @@ msgstr "FORBID nick motivo"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
@@ -1079,11 +1074,6 @@ msgstr "LIST opções [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE servidor [motivo]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP alvo senha"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1094,7 +1084,7 @@ msgstr "MODE canal modos"
 msgid "user [reason]"
 msgstr "JUPE servidor [motivo]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1236,7 +1226,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR apaga todas as entradas da lista de AKILL."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1372,7 +1362,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1740,7 +1730,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1796,7 +1786,7 @@ msgstr "%d bots disponíveis."
 msgid "%d modules loaded."
 msgstr "%d módulos carregados."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "%d nicks no grupo."
@@ -1899,9 +1889,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "         Kick por Caps: %s (mínimo %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "Lista de acesso do canal %s está vazia."
@@ -1932,8 +1922,8 @@ msgstr "Lista de palvrões do %s está vazia."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s não pode ser o successor do canal %s porque ele é o founder."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Comandos do %s:"
@@ -2205,7 +2195,7 @@ msgstr "Lista de akick do %s vazia."
 msgid "%s's auto join list:"
 msgstr "    AKICK      Faz a manutenção da Lista de Autokick"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Sua lista de acesso está vazia."
@@ -2311,7 +2301,7 @@ msgstr "%s está online neste momento."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2378,17 +2368,17 @@ msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID nick motivo"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID nick motivo"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+tempo] {#canal} [motivo]"
@@ -2470,7 +2460,7 @@ msgstr "Opções de nível de acesso para o canal %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Níveis de acesso para o %s redefinidos para o padrão."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "Lista de acesso para %s:"
@@ -2607,7 +2597,7 @@ msgstr "Todos os memos para o canal %s foram apagados."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2640,12 +2630,12 @@ msgstr "Todos os vhost's no grupo %s foram ajustados para %s"
 msgid "All user modes on %s have been synced."
 msgstr "Todas as O:lines do servidor %s foram resetadas."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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"
@@ -3091,7 +3081,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3104,7 +3094,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3266,12 +3256,12 @@ msgstr "    EMAIL      Associa um endereço de e-mail ao seu nick"
 msgid "Associate oper info with a nick or channel"
 msgstr "    ASSIGN             Associa um bot ao canal"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      Associa um endereço de e-mail ao seu nick"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3288,7 +3278,7 @@ msgstr ""
 "nick ou o mesmo seje inválido, não será possível recuperar\n"
 "a senha perdida."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3598,8 +3588,8 @@ msgstr "O bot não irá mais kickar por flood."
 msgid "Bot won't kick for repeats anymore."
 msgstr "O bot não irá mais kickar por repetição."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3643,7 +3633,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Bot irá kickar OPs no canal %s."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Não foi possível enviar e-mail agora; tente novamente mais tarde."
 
@@ -3713,7 +3703,7 @@ msgstr ""
 "Faz com que os Services atualizem o banco de dados logo que\n"
 "você envia este comando."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Lista de acesso para %s:"
@@ -3727,7 +3717,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s alterou seus modos de usuário."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr "    MSG        Altera o método de comunicação dos Services"
@@ -3775,7 +3765,7 @@ msgstr ""
 "Muda o fundador do canal. O novo nick deve estar\n"
 "registrado."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3792,7 +3782,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/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3844,7 +3834,7 @@ msgstr ""
 "(%d), o canal será dropado, como se nenhum sucessor tivesse\n"
 "sido ajustado. O novo nick deverá estar registrado."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP canal"
@@ -3929,7 +3919,7 @@ 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/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Lista de acesso do canal %s apagada."
@@ -3966,8 +3956,8 @@ msgstr ""
 "Canais nos quais %s tem acesso:\n"
 "  Núm  Canal                Nível    Descrição "
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s não foi encontrado na lista de acesso do %s."
@@ -4148,7 +4138,7 @@ msgstr "    CONFIRM    Confirma um código de autorização do NickServ"
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  Limpa os modos de um canal"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4167,21 +4157,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "        Criado: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "        Criado: %s"
@@ -4240,7 +4230,7 @@ msgstr "GROUP alvo senha"
 msgid "DEL [nickname] channel"
 msgstr "MODE canal modos"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID nick motivo"
@@ -4250,8 +4240,8 @@ msgstr "FORBID nick motivo"
 msgid "DEL [nickname] mask"
 msgstr "MODE canal modos"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [canal] {núm | list | ALL}"
@@ -4572,8 +4562,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "Descrição do canal %s alterada para %s."
@@ -4733,12 +4723,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
@@ -4827,7 +4817,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4864,14 +4854,14 @@ msgstr ""
 "mesmo depois que os usuários deixarem o canal, e será\n"
 "restaurado na próxima vez que o canal for reutilizado."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5077,7 +5067,7 @@ msgstr "Fim da listagem."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Fim da listagem."
@@ -5097,7 +5087,7 @@ msgstr "Fim da listagem."
 msgid "End of list - %d channels shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Fim da listagem - %d/%d resultados mostrados."
@@ -5132,37 +5122,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Português"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Greet message for %s unset."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Modo Fantasia está agora ATIVADO no canal %s."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Greet message for %s changed to %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Lista de acesso para %s está vazia."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "Lista de acesso para %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Todos os memos para o canal %s foram apagados."
@@ -5186,7 +5176,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5212,12 +5202,12 @@ msgstr "Sessão para %s (#%d) alterada para a posição %d."
 msgid "Exception for %s has been updated to %d."
 msgstr "Exceção para %s foi atualizada para %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "               Expira em: %s"
@@ -5232,7 +5222,7 @@ msgstr "Exceção para %s foi atualizada para %d."
 msgid "Expiry for %s updated."
 msgstr "Tempo de expiração para %s alterado."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantasia"
 
@@ -5251,11 +5241,16 @@ msgstr "Modo Fantasia está agora ATIVADO no canal %s."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Retira seu status de Owner no canal"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "A máscara %s já se encontra em sua lista de acesso."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "You are already in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5487,12 +5482,12 @@ msgstr "Lista de Ignore dos Services vazia."
 msgid "Ignore list:"
 msgstr "Lista de bots:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Proteção de Voices"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "                  E-mail: %s"
@@ -5581,17 +5576,17 @@ msgstr "       Italics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Se junta a um grupo"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Modo mensagem"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Opção Peace para %s está agora ATIVADA."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Opção Peace para %s está agora ATIVADA."
@@ -5610,7 +5605,7 @@ msgstr "Key for channel %s is %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Kicka um usuário de um canal"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5651,8 +5646,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [canal] [list | NEW]"
@@ -5662,8 +5657,8 @@ msgstr "LIST [canal] [list | NEW]"
 msgid "LIST [mask | list]"
 msgstr "LIST [canal] [list | NEW]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK nick"
@@ -5672,7 +5667,7 @@ msgstr "CHECK nick"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [texto|núm]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Linguagem alterada para Português."
 
@@ -5686,7 +5681,7 @@ msgstr "Último memo enviado para %s foi cancelado."
 msgid "Last quit message"
 msgstr "Última mensagem de saída: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "    Último horário visto: %s"
@@ -5700,7 +5695,7 @@ msgstr "   Último endereço visto: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "    Último horário visto: %s"
@@ -5730,8 +5725,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "O nível deve ser entre %d e %d inclusive."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5757,17 +5752,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     Lista os módulos carregados"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "Lista de nicks no grupo %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Lista de nicks no grupo %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Lista de nicks no grupo:"
 
@@ -5820,7 +5815,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "Lista de nicks no grupo:"
@@ -6317,7 +6312,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Você não pode remover o e-mail nesta Rede."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6352,15 +6347,15 @@ msgstr "    DEFCON      Manipula o sistema DefCon"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Modifica o tópico de um canal"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6373,8 +6368,8 @@ msgstr "A máscara %s já se encontra em sua lista de acesso."
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "A máscara %s já se encontra em sua lista de acesso."
@@ -6426,7 +6421,7 @@ msgstr "Limite de memos para %s é agora de %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Limite de memos para %s é agora de 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Memo enviado para %s."
@@ -6436,12 +6431,12 @@ msgstr "Memo enviado para %s."
 msgid "Memos for %s:"
 msgstr "        Trava de modo: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL mensagem"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Modo mensagem"
 
@@ -6522,7 +6517,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mostra a lista de acesso atual."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6547,12 +6542,12 @@ msgstr "    AOP        Modifica a lista de AOP (AutoOP) de um canal"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS     Modifica a lista de endereços autorizados"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS     Modifica a lista de usuários privilegiados"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Modifica a lista de ignorados dos Services"
@@ -6606,10 +6601,10 @@ msgstr "Módulo: %s Versão: %s Autor: %s Carregado: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Módulo: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6626,9 +6621,9 @@ msgstr "Lista de acesso para %s:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO nick"
@@ -6693,12 +6688,12 @@ msgstr "Nick %s registrado."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s foi truncado para %d caracteres."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
@@ -6713,7 +6708,7 @@ msgstr "O nick %s não possui nenhum memo seu."
 msgid "Nick %s has been logged out."
 msgstr "O nick %s foi desconectado."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6723,7 +6718,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s foi suspendido."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6763,17 +6758,17 @@ msgstr "O canal %s já está registrado!"
 msgid "Nickname %s may not be registered."
 msgstr "O canal %s não pode ser registrado."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "O nick %s foi registrado em sua conta: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nick %s registrado."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6782,7 +6777,7 @@ msgstr "Auto-op"
 msgid "No bot"
 msgstr "Sem bot"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "não expira"
@@ -6816,8 +6811,8 @@ msgstr "Nenhum email listado para %s."
 msgid "No matching entries on %s %s list."
 msgstr "Resultado não encontrado na lista de AOP do %s."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Resultado não encontrado na lista de acesso do %s."
@@ -6888,8 +6883,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Lista de acesso para %s:"
@@ -6899,7 +6894,7 @@ msgstr "Lista de acesso para %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Modos do usuário %s alterados."
@@ -6927,17 +6922,17 @@ msgstr "Nenhuma"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7063,12 +7058,12 @@ msgstr "Senha para %s é %s."
 msgid "Password incorrect."
 msgstr "Senha incorreta."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Paz"
 
@@ -7082,7 +7077,7 @@ msgstr "Opção Peace para %s está agora ATIVADA."
 msgid "Peace option for %s is now on."
 msgstr "Opção Peace para %s está agora ATIVADA."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7118,17 +7113,17 @@ msgstr "Por favor aguarde %d segundos e tente novamente."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Por favor aguarde %d segundos antes de usar o comando SEND novamente."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr ""
@@ -7177,7 +7172,7 @@ msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
@@ -7186,8 +7181,8 @@ msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Privado"
 
@@ -7231,26 +7226,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Proteção"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Protection is now ON for %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
@@ -7267,7 +7262,7 @@ msgstr ""
 "usa por completo todo o host real ident@host para cada nick;\n"
 "em seguida, força o AKILL."
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Proteção de Voices"
@@ -7313,11 +7308,11 @@ msgstr "    READ     Lê a(s) mensagem(ns)"
 msgid "Real name"
 msgstr "      RealName: %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7346,14 +7341,14 @@ msgstr "    LEVELS     Redefine os níveis de acesso"
 msgid "Regains control of your nick"
 msgstr "    RELEASE    Retoma a custódia do seu nick após um RECOVER"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s está ativada"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7361,8 +7356,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7438,7 +7433,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7538,7 +7533,7 @@ msgstr "    MODLOAD     Carrega um módulo"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7618,7 +7613,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
@@ -7628,7 +7623,7 @@ msgstr "    RELOAD      Recarrega o arquivo de configuração dos Services"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Acesso restrito ao canal"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Acesso restrito"
@@ -7774,12 +7769,12 @@ msgstr "NOOP {SET|REVOKE} servidor"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Senha aceita - você está agora reconhecido."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Senha aceita - você está agora reconhecido."
@@ -7802,7 +7797,7 @@ msgstr "    RESTART     Salva os dados e reinicia os Services"
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Founder Seguro"
@@ -7817,7 +7812,7 @@ msgstr "Opção Secure Founder para %s está agora ATIVADA."
 msgid "Secure founder option for %s is now on."
 msgstr "Opção Secure Founder para %s está agora ATIVADA."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "OPs Seguros"
@@ -7842,12 +7837,12 @@ msgstr "Opção Secure para %s está agora ATIVADA."
 msgid "Secure option for %s is now on."
 msgstr "Opção Secure para %s está agora ATIVADA."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
@@ -7857,7 +7852,7 @@ msgstr "Secure option is now ON for %s."
 msgid "Secureops enforced on %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Segurança"
 
@@ -7909,7 +7904,7 @@ msgstr "Founder Seguro"
 msgid "Sends a memo and requests a read receipt"
 msgstr "    RSEND    Envia um memo e pede uma confirmação de leitura"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8173,12 +8168,12 @@ msgstr "Services will no longer autoop %s in channels."
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
@@ -8251,7 +8246,7 @@ msgstr "    DISPLAY    Mostra o seu grupo nos Services"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       Ajusta o fundador do canal"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8659,7 +8654,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8750,11 +8745,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Opção Signed Kicks para %s está agora ATIVADA."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Kicks assinados"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s possui muitos memos atualmente e não pode receber mais nenhum."
@@ -8769,12 +8764,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Desculpe, o comando SET está temporariamente desativado."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Desculpe, comando CHANGE temporariamente desativado."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Desculpe, o comando SET está temporariamente desativado."
 
@@ -8785,7 +8780,7 @@ msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Desculpe, a modificação da lista de AOP está temporariamente desabilitada."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Desculpe, o registro de canais está temporariamente desativado."
 
@@ -8823,7 +8818,7 @@ msgstr "Desculpe, a opção SET está temporariamente desativada."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Desculpe, o comando DROP está temporariamente desativado."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Desculpe, o comando GROUP está temporariamente desativado."
 
@@ -8842,13 +8837,13 @@ msgstr ""
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Desculpe, você pode ter somente %d entradas em sua lista de acesso."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8985,7 +8980,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr ""
@@ -8995,7 +8990,7 @@ msgstr ""
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -9006,7 +9001,7 @@ msgstr ""
 "\n"
 "Lista todos os nicks do grupo."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9242,7 +9237,7 @@ msgstr ""
 "comando antes de você usá-los. A senha deve ser a mesma que\n"
 "você enviou com o comando REGISTER."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9426,21 +9421,21 @@ 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/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9448,13 +9443,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "O comando IMMED não está disponível nesta Rede."
 
@@ -9536,7 +9531,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9617,7 +9612,17 @@ msgstr ""
 "pré-definido de restrições aos Services, útil durante uma\n"
 "tentativa de ataque à Rede."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Greet message for %s unset."
@@ -9626,15 +9631,6 @@ msgstr "Greet message for %s unset."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9768,7 +9764,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "Existem %d memos para o canal %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Deleta o vHost de todos os nicks de um grupo"
@@ -9864,7 +9860,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -9876,7 +9872,7 @@ 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/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9954,7 +9950,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10023,7 +10019,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10066,7 +10062,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10092,7 +10088,7 @@ msgstr ""
 "Este comando carrega o módulo chamado NomeDoArquivo\n"
 "do diretório de módulos."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10218,12 +10214,12 @@ msgstr "Desligue o CAPS LOCK!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       Ativa/Desativa a proteção de kill para o seu nick"
@@ -10262,7 +10258,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/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10293,7 +10289,7 @@ msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     Ativa/Desativa os recursos de segurança para o seu nick"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10324,7 +10320,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10401,7 +10397,7 @@ msgstr ""
 "Digite /msg %s HELP SET opção para maiores informações\n"
 "sobre uma opção em particular."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10417,8 +10413,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Descarrega um módulo"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Impossível remover o módulo %s"
@@ -10643,8 +10639,8 @@ msgstr "vhost do grupo %s ajustado para %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [canal] [list | NEW]"
@@ -10797,12 +10793,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Você já é um membro do grupo %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Você já está identificado."
 
@@ -10830,6 +10826,11 @@ msgstr "Você não tem permissão para mudar seu limite de memos."
 msgid "You are not permitted to change your memo limit."
 msgstr "Você não tem permissão para mudar seu limite de memos."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Você já está identificado."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10839,7 +10840,7 @@ msgstr "Você é agora um Super-Admin"
 msgid "You are now an IRC Operator."
 msgstr "Você agora é um Operador de IRC."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr "You are now identified for your nick "
@@ -10902,8 +10903,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Você não pode usar o comando GHOST em si mesmo!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Resultado não encontrado na lista de acesso do %s."
@@ -10914,7 +10915,7 @@ msgid "You can't logout %s, they are a Services Operator."
 msgstr ""
 "Impossível fazer logout em %s porque ele é um Administrador dos Services."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "Você não pode remover o e-mail nesta Rede."
@@ -10929,7 +10930,7 @@ msgstr "Você não pode colocar o limite de memos para %s maior que %d."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Você não pode colocar seu limite de memos maior que %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Você não pode remover o e-mail nesta Rede."
 
@@ -11000,7 +11001,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Digite /msg %s READ %d para ler."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "You have been invited to %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
@@ -11058,11 +11064,16 @@ msgstr "    DELALL      Deleta o vHost de todos os nicks de um grupo"
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "Você não pode remover o e-mail nesta Rede."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "Você não pode remover o e-mail nesta Rede."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11093,7 +11104,7 @@ msgid ""
 msgstr ""
 "Impossível fazer logout em %s porque ele é um Administrador dos Services."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11125,7 +11136,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -11136,7 +11147,7 @@ msgstr ""
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11146,11 +11157,6 @@ msgstr ""
 "Este e-mail permitirá que você receba sua senha por ele\n"
 "caso você se esqueça dela."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s não é um ban válido."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11209,17 +11215,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Bot %s foi removido."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "Você já está identificado."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Você já está identificado."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "E-mail address for %s changed to %s."
@@ -11229,7 +11235,7 @@ msgstr "E-mail address for %s changed to %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Todas as O:lines do servidor %s foram removidas."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11286,12 +11292,12 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Seu nick foi desconectado."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr "Seu nick já está registrado; digite /msg %s DROP primeiro."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11300,7 +11306,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Nick %s registrado."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Seu nick está sendo mudado para %s."
@@ -11309,12 +11315,12 @@ msgstr "Seu nick está sendo mudado para %s."
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Seu passcode foi re-enviado para %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr "Sua senha é %s - guarde ela para uso posterior."
@@ -11323,7 +11329,7 @@ msgstr "Sua senha é %s - guarde ela para uso posterior."
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
@@ -11443,7 +11449,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO nick"
@@ -11452,8 +11458,8 @@ msgstr "INFO nick"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK nick"
@@ -11475,7 +11481,7 @@ msgstr "CHANKILL [+tempo] {#canal} [motivo]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11644,7 +11650,7 @@ msgstr "UNBAN canal [nick]"
 msgid "{nick | channel}"
 msgstr "CANCEL {nick | canal}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | canal} texto"
diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po
index a851c4199..3698018ca 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 21:10-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Russian\n"
@@ -58,7 +58,7 @@ msgstr "Запись вида %s успешно добавлена в спис
 msgid "%s added to %s's access list."
 msgstr "Маска вида %s успешно добавлена в ваш список доступа."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "Маска вида %s успешно добавлена в ваш список доступа."
@@ -78,11 +78,6 @@ msgstr "Запись вида %s успешно добавлена в спис
 msgid "%s added to the AKILL list."
 msgstr "Запись вида %s успешно добавлена в список AKILL'ов."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "Маска вида %s успешно добавлена в ваш список доступа."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -114,7 +109,7 @@ msgstr ""
 "информации по конкретной команде, напишите\n"
 "/msg  %s HELP команда."
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -132,7 +127,7 @@ msgstr ""
 "Для более подробной информации по какой-либо команде используйте:\n"
 "/msg %s HELP команда."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -227,7 +222,7 @@ msgstr "Запись вида %s успешно удалена из списк
 msgid "%s deleted from %s's access list."
 msgstr "Ник %s успешно удален из списка доступа канала %s."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "Маска вида %s успешно удалена из вашего списка доступа."
@@ -247,11 +242,6 @@ msgstr "%s успешно удален из AOP'ов канала %s."
 msgid "%s deleted from the AKILL list."
 msgstr "Запись вида %s успешно удалена из списка AKILL'ов."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "Маска вида %s успешно удалена из вашего списка доступа."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -338,7 +328,7 @@ msgstr "Маска вида %s успешно добавлена в ваш с
 msgid "%s is already suspended."
 msgstr "You are already in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr ""
@@ -407,7 +397,7 @@ msgstr "Запись вида %s успешно добавлена в спис
 msgid "%s not found on %s %s list."
 msgstr "Ник %s в списке AOP'ов канала %s не обнаружен."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "Ник %s в списке доступа канала %s не обнаружен."
@@ -427,7 +417,7 @@ msgstr "Запись вида %s в списке плохих слов кан
 msgid "%s not found on %s's access list."
 msgstr "Ник %s в списке доступа канала %s не обнаружен."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "Маска вида %s не найдена в вашем списке доступа."
@@ -614,6 +604,11 @@ msgid "[auto-memo] The memo you sent to %s has been viewed."
 msgstr ""
 "[авто-сообщение] Мемо-сообщение, которые вы посылали %s, было прочитано."
 
+#: modules/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP главный_ник пароль"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -623,11 +618,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET ник AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP #канал"
@@ -657,8 +652,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel modes"
 msgstr "MODE #канал режимы"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN #канал [nick]"
@@ -702,7 +697,7 @@ msgstr "MODE #канал режимы"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE #канал режимы"
@@ -721,9 +716,9 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel APPEND topic"
 msgstr "TOPIC #канал [текст_топика]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP #канал"
@@ -738,12 +733,12 @@ msgstr "TOPIC #канал [текст_топика]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP #канал"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE #канал режимы"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [#канал] {номер_сообщения | список_записей | ALL}"
@@ -762,7 +757,7 @@ msgstr "DEL [#канал] {номер_сообщения | список_з
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP #канал"
@@ -772,8 +767,8 @@ msgstr "DROP #канал"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP #канал {ADD|DEL|LIST|CLEAR} [ник | номер запис]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP #канал {ADD|DEL|LIST|CLEAR} [ник | номер запис]"
@@ -820,12 +815,12 @@ msgstr "AOP #канал {ADD|DEL|LIST|CLEAR} [ник | номер запи
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [#канал] {номер_сообщения | список_записей | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER #канал описание"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN #канал [nick]"
@@ -855,8 +850,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP #канал"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET #канал XOP {ON | OFF}"
@@ -893,13 +888,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET #канал SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET #канал XOP {ON | OFF}"
@@ -908,7 +903,7 @@ msgstr "SET #канал XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE номер"
@@ -923,8 +918,8 @@ msgstr "STAFF memo-text"
 msgid "message"
 msgstr "GLOBAL сообщение"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -937,10 +932,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP главный_ник пароль"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO ник"
@@ -970,13 +965,13 @@ msgstr "SVSNICK ник новый_ник "
 msgid "nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK ник"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID ник причина"
@@ -986,7 +981,7 @@ msgstr "FORBID ник причина"
 msgid "nickname email"
 msgstr "FORBID ник причина"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID ник причина"
@@ -1026,15 +1021,15 @@ msgstr "FORBID ник причина"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET ник AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET ник KILL {ON | QUICK | IMMED | OFF}"
@@ -1103,11 +1098,6 @@ msgstr "LIST маска [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE имя_сервера [причина]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP главный_ник пароль"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1118,7 +1108,7 @@ msgstr "MODE #канал режимы"
 msgid "user [reason]"
 msgstr "JUPE имя_сервера [причина]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1268,7 +1258,7 @@ msgstr ""
 "\n"
 "AKILL CLEAR позволяет  полностью  очистить  список AKILL'ов."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1427,7 +1417,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1813,7 +1803,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1870,7 +1860,7 @@ msgstr "Количество доступных ботов: %d"
 msgid "%d modules loaded."
 msgstr "Количество загруженных модулей: %d"
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "Количество ников в группе: %d"
@@ -1973,9 +1963,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "Цензор CapsLOCK......: %s (минимум %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "Список доступа канала %s пуст."
@@ -2006,8 +1996,8 @@ msgstr "Список плохих слов канала %s пуст."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s не может быть наследником канала %s так как он его владелец."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "Список команд %s:"
@@ -2282,7 +2272,7 @@ msgstr "Список автокиков канала %s пуст."
 msgid "%s's auto join list:"
 msgstr "    AKICK      Управление списком автокиков канала"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Ваш список доступа пуст."
@@ -2388,7 +2378,7 @@ msgstr "%s сейчас в сети."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2457,17 +2447,17 @@ msgstr "CHANKILL [+срок_истечения] {#канал} [причин
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+срок_истечения] {#канал} [причина]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID ник причина"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+срок_истечения] {#канал} [причина]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID ник причина"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+срок_истечения] {#канал} [причина]"
@@ -2549,7 +2539,7 @@ msgstr "Установки списка доступа для канала %s:"
 msgid "Access levels for %s reset to defaults."
 msgstr "Уровни доступа для канала %s сброшены на значения по-умолчанию."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "Список доступа для %s:"
@@ -2688,7 +2678,7 @@ msgstr "Все сообщения канала %s были удалены."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2721,12 +2711,12 @@ msgstr "Все виртуальные хосты для ников группы
 msgid "All user modes on %s have been synced."
 msgstr "Все OLINE-записи на сервере %s восстановлены."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, c-format
 msgid "All vhost's in the group %s have been set to %s."
 msgstr "Все виртуальные хосты для ников группы %s установлены на %s"
 
-#: modules/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, c-format
 msgid "All vhost's in the group %s have been set to %s@%s."
 msgstr "Все виртуальные хосты для ников группы %s установлены на %s@%s"
@@ -3181,7 +3171,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3197,7 +3187,7 @@ msgstr ""
 "уведомлений (notice, нотисы).\n"
 "Примечание: настройка данной опции может быть заблокирована."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3369,12 +3359,12 @@ msgstr "    EMAIL      установка email-адреса на ник"
 msgid "Associate oper info with a nick or channel"
 msgstr "ASSIGN             Установка бота на указанный канал"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      установка email-адреса на ник"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3386,7 +3376,7 @@ msgstr ""
 "Ассоциирует email-адрес с вашим ником. Данный email будет показан\n"
 "в информации о вашем нике, предоставляемой по команде INFO."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Автостатус"
 
@@ -3699,8 +3689,8 @@ msgstr "Режим кика за флуд отключен."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Режим кика за чрезмерные повторы отключен."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3743,7 +3733,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "С этого момента, бот будет кикать операторов канала %s за нарушения."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "На данный момент отправка email невозможна, попробуйте позже."
 
@@ -3813,7 +3803,7 @@ msgstr ""
 "\n"
 "Заставляет сервисы немедленно сохранить все базы данных на диск."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "Список доступа для %s:"
@@ -3827,7 +3817,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s принудительно изменил ваши пользовательские режимы."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr "    MSG        выбор метода общения сервисов с вами"
@@ -3877,7 +3867,7 @@ msgstr ""
 "Позволяет передать права на владение каналом другому пользователю.\n"
 "Ник нового владельца канала должен быть зарегистрированным."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3893,7 +3883,7 @@ msgstr ""
 "В качестве номера, вы должны указать конкретный номер языка из\n"
 "списка поддерживаемых языков:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3947,7 +3937,7 @@ msgstr ""
 "каналом и тот будет удален. Ко всему прочему, ник наследника канала\n"
 "должен быть зарегистрированным ником."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP #канал"
@@ -4033,7 +4023,7 @@ msgstr "С этого момента, регистрация канала %s н
 msgid "Channel %s %s list has been cleared."
 msgstr "Список AOP'ов канала %s был полностью очищен."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Список доступа канала %s был полностью очищен."
@@ -4070,8 +4060,8 @@ msgstr ""
 "Каналы, на которых у %s есть уровни доступа:\n"
 "Номер  Канал                Уровень  Описание"
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "Ник %s в списке доступа канала %s не обнаружен."
@@ -4255,7 +4245,7 @@ msgstr "    CONFIRM    Подтверждение регистрации код
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  Очистка всех режимов указанного канала"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4274,21 +4264,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "Создан..........: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "Создан..........: %s"
@@ -4347,7 +4337,7 @@ msgstr "GROUP главный_ник пароль"
 msgid "DEL [nickname] channel"
 msgstr "MODE #канал режимы"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID ник причина"
@@ -4357,8 +4347,8 @@ msgstr "FORBID ник причина"
 msgid "DEL [nickname] mask"
 msgstr "MODE #канал режимы"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [#канал] {номер_сообщения | список_записей | ALL}"
@@ -4681,8 +4671,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "Описание канала %s изменено на %s."
@@ -4848,12 +4838,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "Email-адрес для %s изменен на %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "Email-адрес для %s удален."
@@ -4962,7 +4952,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -5002,14 +4992,14 @@ msgstr ""
 "же, как только канал снова станет активным (то есть, на него опять\n"
 "кто-либо зайдет)."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5225,7 +5215,7 @@ msgstr "Конец списка каналов."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Конец списка пользователей."
@@ -5245,7 +5235,7 @@ msgstr "Конец списка пользователей."
 msgid "End of list - %d channels shown."
 msgstr "Конец списка - %d/%d записей показано."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Конец списка - %d/%d записей показано."
@@ -5280,37 +5270,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Русский"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Приветствие для %s удалено."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "FANTASY-режим для канала %s активирован."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Приветствие для %s изменено на %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Список доступа для %s пуст."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "Список доступа для %s:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "Все сообщения канала %s были удалены."
@@ -5334,7 +5324,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5360,12 +5350,12 @@ msgstr "Исключение для %s (#%d) перемещено в пози
 msgid "Exception for %s has been updated to %d."
 msgstr "Лимит сессий для записи вида %s был изменен на %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "Регистрация истекает....: %s"
@@ -5380,7 +5370,7 @@ msgstr "Лимит сессий для записи вида %s был изм
 msgid "Expiry for %s updated."
 msgstr "Срок истечения записи %s успешно изменен."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "FANTASY-режим"
 
@@ -5399,11 +5389,16 @@ msgstr "FANTASY-режим для канала %s активирован."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Снимает с вас статус владельца канала"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "Маска вида %s уже присутствует в вашем списке доступа."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "You are already in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5637,12 +5632,12 @@ msgstr "Список игнорируемых ников пуст."
 msgid "Ignore list:"
 msgstr "Список ботов:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Не кикать войсов"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "Email-адрес.............: %s"
@@ -5734,17 +5729,17 @@ msgstr "Italics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Объединение ников в группы"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Режим приватных сообщений"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Режим спокойствия для канала %s активирован."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Режим спокойствия для канала %s активирован."
@@ -5763,7 +5758,7 @@ msgstr "Key for channel %s is %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Кикнуть пользователя с канала посредством сервисов"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5805,8 +5800,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [#канал] [список_записей | NEW]"
@@ -5816,8 +5811,8 @@ msgstr "LIST [#канал] [список_записей | NEW]"
 msgid "LIST [mask | list]"
 msgstr "LIST [#канал] [список_записей | NEW]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK ник"
@@ -5826,7 +5821,7 @@ msgstr "CHECK ник"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [текст|номер]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Язык сервисов изменен на Русский."
 
@@ -5840,7 +5835,7 @@ msgstr "Последнее ваше сообщение адресату %s у
 msgid "Last quit message"
 msgstr "Последнее quit-сообщение: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "Последний раз замечен...: %s"
@@ -5854,7 +5849,7 @@ msgstr "Последняя маска.........: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "Последний раз замечен...: %s"
@@ -5884,8 +5879,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Уровень должен быть числом между %d и %d включительно."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5909,17 +5904,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     Список загруженных модулей"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "Список ников в группе %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "Список ников в группе %s:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Список ников в вашей группе:"
 
@@ -5975,7 +5970,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "Список ников в вашей группе:"
@@ -6476,7 +6471,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "Возможность удаления email-адреса в вашей IRC-сети недоступна."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6511,15 +6506,15 @@ msgstr "    DEFCON      Управление системой DefCon (защит
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Установка топика на канале посредством сервисов"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6532,8 +6527,8 @@ msgstr "Маска вида %s уже присутствует в вашем 
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "Маска вида %s уже присутствует в вашем списке доступа."
@@ -6583,7 +6578,7 @@ msgstr "Лимит собщений для %s установлен на %d."
 msgid "Memo limit for %s set to 0."
 msgstr "Лимит сообщений для %s установлен на 0."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "Мемо-сообщение для %s успешно отправлено."
@@ -6593,12 +6588,12 @@ msgstr "Мемо-сообщение для %s успешно отправле
 msgid "Memos for %s:"
 msgstr "Блокировка режимов........: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL сообщение"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Режим приватных сообщений"
 
@@ -6678,7 +6673,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        выводит текущий список \"доверенных\" хостмасок."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6703,12 +6698,12 @@ msgstr "    AOP        Управление списком AOP'ов канала
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS     Управление ACCESS-списком ника (списком хостмасок)"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS     Управление ACCESS-списком привилегий канала"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Управление игнор-списком сервисов"
@@ -6762,10 +6757,10 @@ msgstr "Модуль: %s Версия: %s Автор: %s Загружен:
 msgid "Module: %s [%s] [%s]"
 msgstr "Модуль: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6782,9 +6777,9 @@ msgstr "Список доступа для %s:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO ник"
@@ -6849,12 +6844,12 @@ msgstr "Ник %s успешно зарегистрирован."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Ник %s был усечен до %d символов."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "C этого момента ник %s снова в режиме истечения."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "С этого момента регистрация ника %s никогда не истечет."
@@ -6869,7 +6864,7 @@ msgstr "Ник %s не получал от вас никаких сообщен
 msgid "Nick %s has been logged out."
 msgstr "Ник %s успешно деидентифицирован."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6879,7 +6874,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "С этого момента ник %s находится режиме саспенда."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6919,18 +6914,18 @@ msgstr "Канал %s уже зарегистрирован!"
 msgid "Nickname %s may not be registered."
 msgstr "Канал %s не может быть зарегистрирован."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr ""
 "Ник %s успешно зарегистрирован, в ACCESS-список добавлена хостмаска: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Ник %s успешно зарегистрирован."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Автостатус"
@@ -6939,7 +6934,7 @@ msgstr "Автостатус"
 msgid "No bot"
 msgstr "Без ботов"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "никогда не истечет"
@@ -6973,8 +6968,8 @@ msgstr "Ники с email-адресом %s не обнаружены."
 msgid "No matching entries on %s %s list."
 msgstr "Совпадающих записей в списке AOP'ов канала %s не обнаружено."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Совпадающих записей в списке доступа канала %s не обнаружено."
@@ -7046,8 +7041,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "Список доступа для %s:"
@@ -7057,7 +7052,7 @@ msgstr "Список доступа для %s:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Режимы пользователя %s изменены."
@@ -7085,17 +7080,17 @@ msgstr "отсутствуют"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7221,12 +7216,12 @@ msgstr "Пароль для ника %s - %s"
 msgid "Password incorrect."
 msgstr "Вы указали неверный пароль."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Спокойствие"
 
@@ -7240,7 +7235,7 @@ msgstr "Режим спокойствия для канала %s активи
 msgid "Peace option for %s is now on."
 msgstr "Режим спокойствия для канала %s активирован."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7278,18 +7273,18 @@ msgid "Please wait %d seconds before requesting a new vHost."
 msgstr ""
 "Пожалуйста, подождите %d секунд перед повторным использованием команды SEND."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr ""
 "Пожалуйста, подождите %d секунд перед повторным использованием команды SEND."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, c-format
 msgid "Please wait %d seconds before using the GROUP command again."
 msgstr "Подождите %d секунд перед повторным использованием команды GROUP."
 
-#: modules/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, c-format
 msgid "Please wait %d seconds before using the REGISTER command again."
 msgstr "Подождите %d секунд перед повторным использованием команды REGISTER."
@@ -7335,7 +7330,7 @@ msgstr "    NOEXPIRE      Prevent the channel from expiring"
 msgid "Prevent the nickname from appearing in the LIST command"
 msgstr "    PRIVATE    скрытие ника в списке ников по /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   установка на ник т.н. режима 'не-истечения'"
@@ -7344,8 +7339,8 @@ msgstr "    NOEXPIRE   установка на ник т.н. режима 'не-
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Приватность"
 
@@ -7389,26 +7384,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Защита"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Защита ника %s активирована, лимит времени на ввод пароля: 60 секунд."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with a reduced delay."
 msgstr "Защита ника %s активирована,лимит времени на ввод пароля: 20 секунд."
 
-#: modules/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Защита ника %s активирована, лимит времени на ввод пароля: 0 секунд."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Защита ника %s активирована, лимит времени на ввод пароля: 60 секунд."
@@ -7425,7 +7420,7 @@ msgstr ""
 "указанной причиной на указанный промежуток времени. В качестве маски\n"
 "AKILL'ов будут использованы маски посетителей канала вида идент@хост."
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Не кикать войсов"
@@ -7471,11 +7466,11 @@ msgstr "    READ   Чтение какого-либо сообщения, гру
 msgid "Real name"
 msgstr "Реальное имя....: %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7505,14 +7500,14 @@ msgid "Regains control of your nick"
 msgstr ""
 "    RELEASE    Снятие защиты сервисов с вашего ника после команды RECOVER"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "Режим %s: включен."
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7520,8 +7515,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7597,7 +7592,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7695,7 +7690,7 @@ msgstr "    MODLOAD     Загрузить модуль"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Перезагрузка конфигурационного файла сервисов"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7776,7 +7771,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Перезагрузка конфигурационного файла сервисов"
@@ -7786,7 +7781,7 @@ msgstr "    RELOAD      Перезагрузка конфигурационно
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    ограничение уровня доступа на канал до прописанных"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Ограниченный доступ"
@@ -7934,12 +7929,12 @@ msgstr "NOOP {SET|REVOKE} сервер"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Пароль принят - вы признаны как владелец ника."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Пароль принят - вы признаны как владелец ника."
@@ -7962,7 +7957,7 @@ msgstr "    RESTART     Сохранить базы данных и переза
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Безопасность владельца"
@@ -7977,7 +7972,7 @@ msgstr "Режим безопасности владельца для кана
 msgid "Secure founder option for %s is now on."
 msgstr "Режим безопасности владельца для канала %s активирован."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Контроль статуса оператора"
@@ -8002,12 +7997,12 @@ msgstr "Режим безопасности для канала %s актив
 msgid "Secure option for %s is now on."
 msgstr "Режим безопасности для канала %s активирован."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Режим безопасности для %s активирован."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Режим безопасности для %s активирован."
@@ -8017,7 +8012,7 @@ msgstr "Режим безопасности для %s активирован
 msgid "Secureops enforced on %s."
 msgstr "Режим безопасности для %s активирован."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Безопасность"
 
@@ -8071,7 +8066,7 @@ msgid "Sends a memo and requests a read receipt"
 msgstr ""
 "    RSEND  Отправка мемо-сообщения с условием подтверждения о прочтении"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8339,14 +8334,14 @@ msgstr "Режим автостатуса для %s отключен"
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Режим автостатуса для %s активирован"
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr ""
 "Режим приватных сообщений для %s активирован, теперь сервисы будут отвечать "
 "ему в приват."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr ""
@@ -8421,7 +8416,7 @@ msgstr "    DISPLAY    установка главного ника группы
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       смена владельца канала"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8865,7 +8860,7 @@ msgstr ""
 "владельцу ника статус при входе на канал. Соответственно OFF  -\n"
 "для отключения."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8963,11 +8958,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Режим подписанных киков для канала %s активирован."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "Подписанные кики"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr ""
@@ -8984,12 +8979,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Извините, но возможность настройки опций бота временно недоступна."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Извините, изменение настроек ботов временно недоступно."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Извините, но возможность настройки опций бота временно недоступна."
 
@@ -9000,7 +8995,7 @@ msgid "Sorry, channel %s list modification is temporarily disabled."
 msgstr ""
 "Извините, но возможность модификации списка AOP'ов временно недоступна."
 
-#: modules/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr ""
 "Извините, но возможность модификации списка доступа канала временно "
@@ -9042,7 +9037,7 @@ msgstr "Извините, но настройка опций службы соо
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Извините, но возможность удаления ников временно недоступна."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Извините, но возможность группировки ников временно недоступна."
 
@@ -9060,13 +9055,13 @@ msgstr "Извините, в списке доступа канала может
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Извините, но количество записей в списке доступа не может превышать %d"
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -9208,7 +9203,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Синхронизирует виртуальный хост для всех ников группы"
@@ -9217,7 +9212,7 @@ msgstr "    GROUP       Синхронизирует виртуальный хо
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -9228,7 +9223,7 @@ msgstr ""
 "\n"
 "Выводит список ников в вашей группе."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9476,7 +9471,7 @@ msgstr ""
 "пароля вы должны указать тот самый пароль, который указывали при\n"
 "регистрации вашего ника."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9667,21 +9662,21 @@ msgstr ""
 "команды ACCESS и системы привилегий xOP см. справочную информацию\n"
 "по /msg %s HELP ACCESS и /msg %s HELP SET XOP."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9689,13 +9684,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "Возможность установки режима IMMED в вашей IRC-сети недоступна."
 
@@ -9777,7 +9772,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9862,7 +9857,17 @@ msgstr ""
 "касаться не только работы самих сервисов, но и функционирования сети\n"
 "в целом, что, порою, весьма полезно при разного рода атаках на сеть."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Приветствие для %s удалено."
@@ -9871,15 +9876,6 @@ msgstr "Приветствие для %s удалено."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -10024,7 +10020,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "%d сообщений на канале %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Удаление вирт. хоста у всех ников указанной группы"
@@ -10120,7 +10116,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -10132,7 +10128,7 @@ msgstr ""
 "Эта команда позволяет пользователям установить виртуальный хост\n"
 "с их ТЕКУЩЕГО ника на все ники группы."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -10221,7 +10217,7 @@ msgstr ""
 "Позволяет загрузить какой-либо дополнительный модуль из директории\n"
 "с модулями (modules/). "
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -10288,7 +10284,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10331,7 +10327,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10356,7 +10352,7 @@ msgstr ""
 "Позволяет загрузить какой-либо дополнительный модуль из директории\n"
 "с модулями (modules/). "
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10486,12 +10482,12 @@ msgstr "Выключи CapsLOCK!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     активирование/деактивирование режима безопасности"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     активирование/деактивирование режима безопасности"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       активирование/деактивирование режима защиты"
@@ -10530,7 +10526,7 @@ msgstr ""
 "Примечание: тем не менее, любой, кто знает ваш ник, имеет возможность\n"
 "получить информацию о вас используя команду INFO."
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10567,7 +10563,7 @@ msgstr "    SECURE     активирование/деактивирование
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     активирование/деактивирование режима безопасности"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10601,7 +10597,7 @@ msgstr ""
 "Примечание: возможность установки метода защиты IMMED может быть\n"
 "отключена в вашей IRC-сети."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10681,7 +10677,7 @@ msgstr ""
 "Для более подробной информации о какой-либо конкретной опции, см.\n"
 "справку по /msg %s HELP опция"
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10697,8 +10693,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Выгрузить модуль"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Невозможно выгрузить модуль %s"
@@ -10924,8 +10920,8 @@ msgstr "Виртуальный хост для группы %s установ
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [#канал] [список_записей | NEW]"
@@ -11080,12 +11076,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "Вы уже состоите в группе %s."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "Вы уже идентифицированы."
 
@@ -11113,6 +11109,11 @@ msgstr "Вам запрещено изменять свой лимит сооб
 msgid "You are not permitted to change your memo limit."
 msgstr "Вам запрещено изменять свой лимит сообщений."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "Вы уже идентифицированы."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -11122,7 +11123,7 @@ msgstr "Режим Супер-Администратора активирова
 msgid "You are now an IRC Operator."
 msgstr "Теперь вы IRC-оператор."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -11189,8 +11190,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Вы не можете закрыть свою сессию!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Совпадающих записей в списке доступа канала %s не обнаружено."
@@ -11200,7 +11201,7 @@ msgstr "Совпадающих записей в списке доступа к
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Невозможно деидентифицировать %s так как он Администратор сервисов."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "Возможность удаления email-адреса в вашей IRC-сети недоступна."
@@ -11215,7 +11216,7 @@ msgstr "Вы не можете установить лимит сообщени
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Вы не можете установить лимит сообщений больше чем %d."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "Возможность удаления email-адреса в вашей IRC-сети недоступна."
 
@@ -11287,7 +11288,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Напишите /msg %s READ %d чтобы прочитать его."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "You have been invited to %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
@@ -11345,11 +11351,16 @@ msgstr "    DELALL      Удаление вирт. хоста у всех ник
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "Возможность удаления email-адреса в вашей IRC-сети недоступна."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "Возможность удаления email-адреса в вашей IRC-сети недоступна."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11376,7 +11387,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "Невозможно деидентифицировать %s так как он Администратор сервисов."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11407,7 +11418,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, c-format
 msgid "You must have been using this nick for at least %d seconds to register."
 msgstr ""
@@ -11419,7 +11430,7 @@ msgstr ""
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11430,11 +11441,6 @@ msgstr ""
 "позволит вам использовать функцию восстановления пароля, если вы его "
 "забудете."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "Число %s не является валидным номером шаблона банмаски."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11495,17 +11501,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "Бот под ником %s успешно удален."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "Вы уже идентифицированы."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "Вы уже идентифицированы."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "Email-адрес для %s изменен на %s."
@@ -11515,7 +11521,7 @@ msgstr "Email-адрес для %s изменен на %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "Все OLINE-записи на сервере %s были удалены."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11572,13 +11578,13 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Деидентификация выполнена успешно."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr ""
 "Перед внесением ника в группу, вы должны удалить его командой /msg %s DROP."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11587,7 +11593,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Ник %s успешно зарегистрирован."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Ваш ник изменен на %s"
@@ -11596,12 +11602,12 @@ msgstr "Ваш ник изменен на %s"
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Ваш код аутенфикации был заново выслан на %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
@@ -11611,7 +11617,7 @@ msgstr ""
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
@@ -11731,7 +11737,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {ник | #канал}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO ник"
@@ -11740,8 +11746,8 @@ msgstr "INFO ник"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK ник"
@@ -11763,7 +11769,7 @@ msgstr "CHANKILL [+срок_истечения] {#канал} [причин
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11934,7 +11940,8 @@ msgstr "UNBAN #канал [nick]"
 msgid "{nick | channel}"
 msgstr "CANCEL {ник | #канал}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {ник | #канал} текст_сообщения"
+
diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po
index 684e116ea..3544ab06c 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: 2014-02-23 05:09+0100\n"
+"POT-Creation-Date: 2014-03-23 08:55-0400\n"
 "PO-Revision-Date: 2010-09-19 21:13-0400\n"
 "Last-Translator: Adam <adam@anope.org>\n"
 "Language-Team: Turkish\n"
@@ -57,7 +57,7 @@ msgstr "%s %s kanalının küfür listesine eklendi."
 msgid "%s added to %s's access list."
 msgstr "%s access listenize eklendi."
 
-#: modules/commands/ns_cert.cpp:196
+#: modules/commands/ns_cert.cpp:204
 #, fuzzy, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s access listenize eklendi."
@@ -77,11 +77,6 @@ msgstr "%s AKILL listesine eklendi."
 msgid "%s added to the AKILL list."
 msgstr "%s AKILL listesine eklendi."
 
-#: modules/commands/ns_cert.cpp:180
-#, fuzzy, c-format
-msgid "%s added to your certificate list."
-msgstr "%s access listenize eklendi."
-
 #: modules/pseudoclients/botserv.cpp:134
 #, c-format
 msgid ""
@@ -112,7 +107,7 @@ msgstr ""
 "daha fazla bilgi için, /msg %s HELP komut\n"
 "yazın."
 
-#: modules/pseudoclients/nickserv.cpp:430
+#: modules/pseudoclients/nickserv.cpp:437
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register a nickname and\n"
@@ -128,7 +123,7 @@ msgstr ""
 "/msg %s komut yazın. Belirli bir komut hakkında daha \n"
 "fazla bilgi için, /msg %s HELP komut yazın."
 
-#: modules/pseudoclients/nickserv.cpp:437
+#: modules/pseudoclients/nickserv.cpp:444
 #, fuzzy, c-format
 msgid ""
 "%s allows you to register an account.\n"
@@ -219,7 +214,7 @@ msgstr "%s %s kanalının küfür listesinden çıkarıldı."
 msgid "%s deleted from %s's access list."
 msgstr "%s %s kanalının access listesinden silindi."
 
-#: modules/commands/ns_cert.cpp:226
+#: modules/commands/ns_cert.cpp:233
 #, fuzzy, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s access listenizden silindi."
@@ -239,11 +234,6 @@ msgstr "%s %s kanali AOP listesinden silindi."
 msgid "%s deleted from the AKILL list."
 msgstr "%s AKILL listesinden silindi."
 
-#: modules/commands/ns_cert.cpp:209
-#, fuzzy, c-format
-msgid "%s deleted from your certificate list."
-msgstr "%s access listenizden silindi."
-
 #: modules/commands/cs_access.cpp:679
 #, c-format
 msgid "%s disabled on channel %s."
@@ -326,7 +316,7 @@ msgstr "%s access listenize eklendi."
 msgid "%s is already suspended."
 msgstr "You are already in %s! "
 
-#: modules/commands/ms_send.cpp:46 modules/commands/ms_rsend.cpp:56
+#: modules/commands/ms_rsend.cpp:56 modules/commands/ms_send.cpp:46
 #, fuzzy, c-format
 msgid "%s is not a registered unforbidden nick or channel."
 msgstr "%s geçerli bir bot yada kanal değil."
@@ -393,7 +383,7 @@ msgstr "%s nicki %s kanalının akick listesine eklendi."
 msgid "%s not found on %s %s list."
 msgstr "%s %s kanali AOP listesinde bulunamadi."
 
-#: modules/commands/cs_flags.cpp:254 modules/commands/cs_access.cpp:334
+#: modules/commands/cs_access.cpp:334 modules/commands/cs_flags.cpp:254
 #, c-format
 msgid "%s not found on %s access list."
 msgstr "%s %s kanalının access listesinde bulunamadı."
@@ -413,7 +403,7 @@ msgstr "%s %s kanalının küfür listesinde bulunamadı."
 msgid "%s not found on %s's access list."
 msgstr "%s %s kanalının access listesinde bulunamadı."
 
-#: modules/commands/ns_cert.cpp:219
+#: modules/commands/ns_cert.cpp:226
 #, fuzzy, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s access listenizde bulunamadı."
@@ -590,6 +580,11 @@ msgstr ""
 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/commands/ns_group.cpp:78
+#, fuzzy
+msgid "[target] [password]"
+msgstr "GROUP hedef şifre"
+
 #: modules/commands/ns_set.cpp:433
 msgid "address"
 msgstr ""
@@ -599,11 +594,11 @@ msgstr ""
 msgid "botname {ON|OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
+#: modules/commands/cs_suspend.cpp:152 modules/commands/cs_sync.cpp:20
+#: modules/commands/bs_assign.cpp:91 modules/commands/cs_log.cpp:106
+#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_info.cpp:20
 #: modules/extra/stats/cs_fantasy_top.cpp:39
-#: modules/extra/stats/cs_fantasy_top.cpp:51 modules/commands/cs_info.cpp:20
-#: modules/commands/cs_getkey.cpp:20 modules/commands/cs_suspend.cpp:152
-#: modules/commands/cs_sync.cpp:20 modules/commands/bs_assign.cpp:91
-#: modules/commands/cs_log.cpp:106
+#: modules/extra/stats/cs_fantasy_top.cpp:51
 #, fuzzy
 msgid "channel"
 msgstr "DROP kanaladı"
@@ -633,8 +628,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel modes"
 msgstr "MODE kanaladı modlar"
 
-#: modules/commands/cs_set.cpp:264 modules/commands/cs_set.cpp:962
-#: modules/commands/bs_assign.cpp:20
+#: modules/commands/bs_assign.cpp:20 modules/commands/cs_set.cpp:264
+#: modules/commands/cs_set.cpp:962
 #, fuzzy
 msgid "channel nick"
 msgstr "UNBAN kanaladı [name]"
@@ -678,7 +673,7 @@ msgstr "MODE kanaladı modlar"
 msgid "channel ADD mask level"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:191
+#: modules/commands/cs_entrymsg.cpp:194
 #, fuzzy
 msgid "channel ADD message"
 msgstr "MODE kanaladı modlar"
@@ -697,9 +692,9 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel APPEND topic"
 msgstr "TOPIC kanaladi [konu]"
 
-#: modules/commands/cs_entrymsg.cpp:194 modules/commands/cs_xop.cpp:489
-#: modules/commands/cs_flags.cpp:376 modules/commands/cs_access.cpp:499
-#: modules/commands/bs_badwords.cpp:373 modules/commands/cs_akick.cpp:428
+#: modules/commands/cs_access.cpp:499 modules/commands/bs_badwords.cpp:373
+#: modules/commands/cs_xop.cpp:489 modules/commands/cs_flags.cpp:376
+#: modules/commands/cs_akick.cpp:428 modules/commands/cs_entrymsg.cpp:197
 #, fuzzy
 msgid "channel CLEAR"
 msgstr "DROP kanaladı"
@@ -714,12 +709,12 @@ msgstr "TOPIC kanaladi [konu]"
 msgid "channel CLEAR [ALL]"
 msgstr "DROP kanaladı"
 
-#: modules/commands/cs_entrymsg.cpp:192
+#: modules/commands/cs_entrymsg.cpp:195
 #, fuzzy
 msgid "channel DEL num"
 msgstr "MODE kanaladı modlar"
 
-#: modules/commands/cs_xop.cpp:487 modules/commands/cs_access.cpp:496
+#: modules/commands/cs_access.cpp:496 modules/commands/cs_xop.cpp:487
 #, fuzzy
 msgid "channel DEL {mask | entry-num | list}"
 msgstr "DEL [kanaladı] {num | liste | ALL}"
@@ -738,7 +733,7 @@ msgstr "DEL [kanaladı] {num | liste | ALL}"
 msgid "channel ENFORCE"
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:193 modules/commands/cs_access.cpp:738
+#: modules/commands/cs_access.cpp:738 modules/commands/cs_entrymsg.cpp:196
 #, fuzzy
 msgid "channel LIST"
 msgstr "DROP kanaladı"
@@ -748,8 +743,8 @@ msgstr "DROP kanaladı"
 msgid "channel LIST [mask | entry-num | list]"
 msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 
-#: modules/commands/cs_xop.cpp:488 modules/commands/cs_access.cpp:497
-#: modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_access.cpp:497 modules/commands/bs_badwords.cpp:372
+#: modules/commands/cs_xop.cpp:488
 #, fuzzy
 msgid "channel LIST [mask | list]"
 msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
@@ -796,12 +791,12 @@ msgstr "AOP kanal {ADD|DEL|LIST|CLEAR} [nick | liste-no]"
 msgid "channel VIEW [mask | list]"
 msgstr "DEL [kanaladı] {num | liste | ALL}"
 
-#: modules/commands/cs_register.cpp:20 modules/commands/cs_set.cpp:202
+#: modules/commands/cs_set.cpp:202 modules/commands/cs_register.cpp:20
 #, fuzzy
 msgid "channel [description]"
 msgstr "REGISTER kanaladı açıklama"
 
-#: modules/commands/cs_unban.cpp:20 modules/commands/cs_invite.cpp:20
+#: modules/commands/cs_invite.cpp:20 modules/commands/cs_unban.cpp:20
 #, fuzzy
 msgid "channel [nick]"
 msgstr "UNBAN kanaladı [name]"
@@ -831,8 +826,8 @@ msgstr "BAN #channel nick [reason]"
 msgid "channel [UNLOCK|LOCK]"
 msgstr "DROP kanaladı"
 
-#: modules/fantasy.cpp:20 modules/commands/bs_assign.cpp:154
-#: modules/commands/greet.cpp:20
+#: modules/fantasy.cpp:20 modules/commands/greet.cpp:20
+#: modules/commands/bs_assign.cpp:154
 #, fuzzy
 msgid "channel {ON|OFF}"
 msgstr "SET kanaladi XOP {ON | OFF}"
@@ -869,13 +864,13 @@ msgstr ""
 msgid "channel {ON | LEVEL | OFF}"
 msgstr "SET kanaladı SIGNKICK {ON | LEVEL | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:10 modules/commands/cs_set.cpp:72
-#: modules/commands/cs_set.cpp:333 modules/commands/cs_set.cpp:398
-#: modules/commands/cs_set.cpp:470 modules/commands/cs_set.cpp:633
-#: modules/commands/cs_set.cpp:695 modules/commands/cs_set.cpp:759
-#: modules/commands/cs_set.cpp:823 modules/commands/cs_set.cpp:1048
-#: modules/commands/cs_list.cpp:175 modules/commands/cs_topic.cpp:21
-#: modules/commands/bs_kick.cpp:781 modules/commands/bs_kick.cpp:846
+#: modules/commands/cs_list.cpp:175 modules/commands/bs_kick.cpp:781
+#: modules/commands/bs_kick.cpp:846 modules/commands/cs_topic.cpp:21
+#: modules/commands/cs_set.cpp:72 modules/commands/cs_set.cpp:333
+#: modules/commands/cs_set.cpp:398 modules/commands/cs_set.cpp:470
+#: modules/commands/cs_set.cpp:633 modules/commands/cs_set.cpp:695
+#: modules/commands/cs_set.cpp:759 modules/commands/cs_set.cpp:823
+#: modules/commands/cs_set.cpp:1048 modules/extra/stats/m_chanstats.cpp:10
 #, fuzzy
 msgid "channel {ON | OFF}"
 msgstr "SET kanaladi XOP {ON | OFF}"
@@ -884,7 +879,7 @@ msgstr "SET kanaladi XOP {ON | OFF}"
 msgid "email"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:765
+#: modules/commands/ns_set.cpp:771
 #, fuzzy
 msgid "language"
 msgstr "SET LANGUAGE numara"
@@ -899,8 +894,8 @@ msgstr "STAFF memo-text"
 msgid "message"
 msgstr "GLOBAL mesaj"
 
-#: modules/commands/os_modinfo.cpp:20 modules/commands/os_module.cpp:20
-#: modules/commands/os_module.cpp:57 modules/commands/os_module.cpp:129
+#: modules/commands/os_module.cpp:20 modules/commands/os_module.cpp:57
+#: modules/commands/os_module.cpp:129 modules/commands/os_modinfo.cpp:20
 msgid "modname"
 msgstr ""
 
@@ -913,10 +908,10 @@ msgstr ""
 msgid "new-password"
 msgstr "GROUP hedef şifre"
 
+#: modules/commands/cs_seen.cpp:258 modules/commands/hs_del.cpp:20
+#: modules/commands/hs_del.cpp:60 modules/commands/ms_check.cpp:20
+#: modules/commands/hs_request.cpp:187
 #: modules/extra/stats/cs_fantasy_stats.cpp:52
-#: modules/commands/cs_seen.cpp:258 modules/commands/hs_request.cpp:187
-#: modules/commands/hs_del.cpp:20 modules/commands/hs_del.cpp:60
-#: modules/commands/ms_check.cpp:20
 #, fuzzy
 msgid "nick"
 msgstr "INFO nick"
@@ -946,13 +941,13 @@ msgstr "SVSNICK nick newnick "
 msgid "nick [reason]"
 msgstr "BAN #channel nick [reason]"
 
-#: modules/commands/ns_drop.cpp:19 modules/commands/ns_suspend.cpp:161
-#: modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_drop.cpp:19 modules/commands/ns_getpass.cpp:20
+#: modules/commands/ns_suspend.cpp:161
 #, fuzzy
 msgid "nickname"
 msgstr "CHECK nickname"
 
-#: modules/commands/ns_set.cpp:517
+#: modules/commands/ns_set.cpp:523
 #, fuzzy
 msgid "nickname address"
 msgstr "FORBID nick sebep"
@@ -962,7 +957,7 @@ msgstr "FORBID nick sebep"
 msgid "nickname email"
 msgstr "FORBID nick sebep"
 
-#: modules/commands/ns_set.cpp:840
+#: modules/commands/ns_set.cpp:846
 #, fuzzy
 msgid "nickname language"
 msgstr "FORBID nick sebep"
@@ -1002,15 +997,15 @@ msgstr "FORBID nick sebep"
 msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 msgstr "SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"
 
-#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294
-#: modules/commands/ns_set.cpp:602 modules/commands/ns_set.cpp:953
-#: modules/commands/ns_set.cpp:1044 modules/commands/ns_set.cpp:1073
-#: modules/commands/ns_list.cpp:252
+#: modules/commands/ns_set.cpp:294 modules/commands/ns_set.cpp:608
+#: modules/commands/ns_set.cpp:959 modules/commands/ns_set.cpp:1050
+#: modules/commands/ns_set.cpp:1079 modules/commands/ns_list.cpp:252
+#: modules/extra/stats/m_chanstats.cpp:122
 #, fuzzy
 msgid "nickname {ON | OFF}"
 msgstr "SASET nickname AUTOOP {ON | OFF}"
 
-#: modules/commands/ns_set.cpp:731
+#: modules/commands/ns_set.cpp:737
 #, fuzzy
 msgid "nickname {ON | QUICK | IMMED | OFF}"
 msgstr "SASET nickname KILL {ON | QUICK | IMMED | OFF}"
@@ -1079,11 +1074,6 @@ msgstr "LIST model [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"
 msgid "server [reason]"
 msgstr "JUPE serverismi [sebep]"
 
-#: modules/commands/ns_group.cpp:78
-#, fuzzy
-msgid "target password"
-msgstr "GROUP hedef şifre"
-
 #: modules/commands/os_mode.cpp:139
 #, fuzzy
 msgid "user modes"
@@ -1094,7 +1084,7 @@ msgstr "MODE kanaladı modlar"
 msgid "user [reason]"
 msgstr "JUPE serverismi [sebep]"
 
-#: modules/pseudoclients/nickserv.cpp:460
+#: modules/pseudoclients/nickserv.cpp:467
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1226,7 +1216,7 @@ msgstr ""
 "\n"
 "Servis operatörlerinin Kullanımıyla sınırlıdır."
 
-#: modules/pseudoclients/nickserv.cpp:456
+#: modules/pseudoclients/nickserv.cpp:463
 #, fuzzy, c-format
 msgid ""
 " \n"
@@ -1362,7 +1352,7 @@ msgid ""
 "other channel users.\n"
 msgstr ""
 
-#: modules/pseudoclients/nickserv.cpp:450
+#: modules/pseudoclients/nickserv.cpp:457
 #, fuzzy
 msgid ""
 " \n"
@@ -1719,7 +1709,7 @@ msgstr ""
 msgid " but %s mysteriously dematerialized."
 msgstr ""
 
-#: src/messages.cpp:333
+#: src/messages.cpp:328
 #, c-format
 msgid ""
 "\"/msg %s\" is no longer supported.  Use \"/msg %s@%s\" or \"/%s\" instead."
@@ -1775,7 +1765,7 @@ msgstr "%d bot mevcut."
 msgid "%d modules loaded."
 msgstr "%d Modules loaded."
 
-#: modules/commands/ns_group.cpp:318
+#: modules/commands/ns_group.cpp:345
 #, fuzzy, c-format
 msgid "%d nickname(s) in the group."
 msgstr "Grupta %d nick var."
@@ -1878,9 +1868,9 @@ msgstr ""
 msgid "%s (minimum %d/%d%%)"
 msgstr "     Büyük yazıda atma : %s (minimum %d/%d%%)"
 
-#: modules/commands/cs_flags.cpp:295 modules/commands/cs_access.cpp:241
-#: modules/commands/cs_access.cpp:345 modules/commands/cs_access.cpp:450
-#: modules/commands/cs_access.cpp:463
+#: modules/commands/cs_access.cpp:241 modules/commands/cs_access.cpp:345
+#: modules/commands/cs_access.cpp:450 modules/commands/cs_access.cpp:463
+#: modules/commands/cs_flags.cpp:295
 #, c-format
 msgid "%s access list is empty."
 msgstr "%s kanalının access listesi boş."
@@ -1911,8 +1901,8 @@ msgstr "%s kanalının küfür listesi boş."
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s %s kanalında successor olamaz çünkü zaten o kanalın founderı."
 
-#: modules/pseudoclients/global.cpp:90 modules/pseudoclients/operserv.cpp:275
-#: modules/pseudoclients/hostserv.cpp:78
+#: modules/pseudoclients/operserv.cpp:275
+#: modules/pseudoclients/hostserv.cpp:78 modules/pseudoclients/global.cpp:90
 #, c-format
 msgid "%s commands:"
 msgstr "%s commands:"
@@ -2183,7 +2173,7 @@ msgstr "%s kanalının akick listesi boş."
 msgid "%s's auto join list:"
 msgstr "    AKICK      Autokick listesini düzenler"
 
-#: modules/commands/ns_cert.cpp:235
+#: modules/commands/ns_cert.cpp:242
 #, fuzzy, c-format
 msgid "%s's certificate list is empty."
 msgstr "Your access list is empty."
@@ -2289,7 +2279,7 @@ msgstr "      %s şu an bağlı."
 msgid "<unknown>"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:476
+#: modules/commands/ns_set.cpp:482
 #, fuzzy, c-format
 msgid ""
 "A confirmation e-mail has been sent to %s. Follow the instructions in it to "
@@ -2357,17 +2347,17 @@ msgstr "CHANKILL [+expiry] {#channel} [reason]"
 msgid "ADD [nickname] channel [key]"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/commands/ns_cert.cpp:251
-#, fuzzy
-msgid "ADD [nickname] fingerprint"
-msgstr "FORBID nick sebep"
-
 #: modules/commands/ns_access.cpp:102
 #, fuzzy
 msgid "ADD [nickname] mask"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
 
-#: modules/commands/os_sxline.cpp:651 modules/commands/os_akill.cpp:375
+#: modules/commands/ns_cert.cpp:258
+#, fuzzy
+msgid "ADD [nickname] [fingerprint]"
+msgstr "FORBID nick sebep"
+
+#: modules/commands/os_akill.cpp:375 modules/commands/os_sxline.cpp:651
 #, fuzzy
 msgid "ADD [+expiry] mask reason"
 msgstr "CHANKILL [+expiry] {#channel} [reason]"
@@ -2449,7 +2439,7 @@ msgstr "%s kanalı için access level ayarları:"
 msgid "Access levels for %s reset to defaults."
 msgstr "%s için access levelleri varsayılanlarla değiştirildi."
 
-#: modules/commands/ns_access.cpp:87 modules/commands/cs_access.cpp:435
+#: modules/commands/cs_access.cpp:435 modules/commands/ns_access.cpp:87
 #, fuzzy, c-format
 msgid "Access list for %s:"
 msgstr "%s nickinin access listesi:"
@@ -2586,7 +2576,7 @@ msgstr "All memos for channel %s have been deleted."
 msgid "All modes cleared on %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:361
+#: modules/commands/ns_register.cpp:358
 msgid ""
 "All new accounts must be validated by an administrator. Please wait for your "
 "registration to be confirmed."
@@ -2619,12 +2609,12 @@ msgstr "All vhost's in the group %s have been set to %s"
 msgid "All user modes on %s have been synced."
 msgstr "%s serverındaki tüm O:line lar resetlendi."
 
-#: modules/commands/hs_group.cpp:50
+#: modules/commands/hs_group.cpp:60
 #, fuzzy, 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/commands/hs_group.cpp:48
+#: modules/commands/hs_group.cpp:58
 #, fuzzy, 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"
@@ -3069,7 +3059,7 @@ msgid ""
 "     MODIFY nickserv forcemail no"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:960
+#: modules/commands/ns_set.cpp:966
 #, fuzzy
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3082,7 +3072,7 @@ msgstr ""
 "the given user. With MSG set, Services will use messages,\n"
 "else they'll use notices."
 
-#: modules/commands/ns_set.cpp:934
+#: modules/commands/ns_set.cpp:940
 #, fuzzy, c-format
 msgid ""
 "Allows you to choose the way Services are communicating with\n"
@@ -3242,12 +3232,12 @@ msgstr "    EMAIL      Nickinizle bir email adresini ilişkilendirir"
 msgid "Associate oper info with a nick or channel"
 msgstr "ASSIGN             Kanala bot sokar"
 
-#: modules/commands/ns_set.cpp:529
+#: modules/commands/ns_set.cpp:535
 #, fuzzy
 msgid "Associates the given E-mail address with the nickname."
 msgstr "    EMAIL      Nickinizle bir email adresini ilişkilendirir"
 
-#: modules/commands/ns_set.cpp:504
+#: modules/commands/ns_set.cpp:510
 #, fuzzy
 msgid ""
 "Associates the given E-mail address with your nickname.\n"
@@ -3260,7 +3250,7 @@ msgstr ""
 "birisi sizin hakkınızda bilgi almak için INFO komutunu \n"
 "kullandığında görünür."
 
-#: modules/commands/ns_set.cpp:1282
+#: modules/commands/ns_set.cpp:1288
 msgid "Auto-op"
 msgstr "Auto-op"
 
@@ -3570,8 +3560,8 @@ msgstr "Bot artık text floodda atmayacak."
 msgid "Bot won't kick for repeats anymore."
 msgstr "Bot artık tekrarda atmayacak."
 
-#: modules/commands/os_sxline.cpp:199 modules/commands/cs_access.cpp:468
-#: modules/commands/os_session.cpp:552
+#: modules/commands/cs_access.cpp:468 modules/commands/os_session.cpp:552
+#: modules/commands/os_sxline.cpp:199
 msgid "By"
 msgstr ""
 
@@ -3614,7 +3604,7 @@ msgstr ""
 msgid "Cannot clone channel %s to itself!"
 msgstr "Bot %s kanalında oplarıda atacak."
 
-#: modules/commands/ns_register.cpp:304
+#: modules/commands/ns_register.cpp:301
 msgid "Cannot send mail now; please retry a little later."
 msgstr "Şu an mail gönderilemiyor; lütfen az sonra tekrar deneyin."
 
@@ -3695,7 +3685,7 @@ msgstr ""
 "\n"
 "Servis adminlerinin Kullanımıyla sınırlıdır."
 
-#: modules/commands/ns_cert.cpp:239
+#: modules/commands/ns_cert.cpp:246
 #, fuzzy, c-format
 msgid "Certificate list for %s:"
 msgstr "%s nickinin access listesi:"
@@ -3709,7 +3699,7 @@ msgstr ""
 msgid "Change channel modes"
 msgstr "%s changed your usermodes."
 
-#: modules/commands/ns_set.cpp:873
+#: modules/commands/ns_set.cpp:879
 #, fuzzy
 msgid "Change the communication method of Services"
 msgstr "    MSG        Change the communication method of Services"
@@ -3759,7 +3749,7 @@ msgstr ""
 "Kanal founderını değiştirir.  Yeni nickin kayıtlı \n"
 "olması gereklidir."
 
-#: modules/commands/ns_set.cpp:852
+#: modules/commands/ns_set.cpp:858
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3774,7 +3764,7 @@ msgstr ""
 "numara aşağıdaki listede desteklenen dillerden biri olarak \n"
 "belirlenir:"
 
-#: modules/commands/ns_set.cpp:816
+#: modules/commands/ns_set.cpp:822
 #, fuzzy
 msgid ""
 "Changes the language Services uses when sending messages to\n"
@@ -3827,7 +3817,7 @@ msgstr ""
 "için bir successor belirtilmemişse kanalın kaydı silinir(drop).\n"
 "Komutta belirtilen nickin kayıtlı olması gereklidir."
 
-#: modules/commands/ns_alist.cpp:48 modules/commands/ns_ajoin.cpp:100
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Channel"
 msgstr "DROP kanaladı"
@@ -3912,7 +3902,7 @@ msgstr "%s kanalı zaman aşımından çıkarıldı."
 msgid "Channel %s %s list has been cleared."
 msgstr "Kanalin %s AOP listesi temizlendi."
 
-#: modules/commands/cs_flags.cpp:361 modules/commands/cs_access.cpp:482
+#: modules/commands/cs_access.cpp:482 modules/commands/cs_flags.cpp:361
 #, c-format
 msgid "Channel %s access list has been cleared."
 msgstr "Kanal %s access listesi temizlendi."
@@ -3949,8 +3939,8 @@ msgstr ""
 "Channels that %s has access on:\n"
 "  Num  Channel              Level    Description "
 
-#: modules/commands/cs_xop.cpp:142 modules/commands/cs_flags.cpp:99
-#: modules/commands/cs_access.cpp:141
+#: modules/commands/cs_access.cpp:141 modules/commands/cs_xop.cpp:142
+#: modules/commands/cs_flags.cpp:99
 #, fuzzy
 msgid "Channels may not be on access lists."
 msgstr "%s %s kanalının access listesinde bulunamadı."
@@ -4131,7 +4121,7 @@ msgstr "    CONFIRM    Confirm a nickserv auth code"
 msgid "Control modes and mode locks on a channel"
 msgstr "    CLEARMODES  Bir kanalın modlarını temizler"
 
-#: modules/commands/cs_entrymsg.cpp:236
+#: modules/commands/cs_entrymsg.cpp:239
 msgid ""
 "Controls what messages will be sent to users when they join the channel."
 msgstr ""
@@ -4150,21 +4140,21 @@ msgid "Copy all settings from one channel to another"
 msgstr ""
 "    UNBAN      Remove all bans preventing a user from entering a channel"
 
-#: modules/commands/bs_info.cpp:58 modules/commands/os_sxline.cpp:199
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/hs_list.cpp:58
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:350
-#: modules/commands/hs_request.cpp:300 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_news.cpp:156 modules/commands/bs_info.cpp:58
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/cs_mode.cpp:431
+#: modules/commands/hs_request.cpp:300
 #, fuzzy
 msgid "Created"
 msgstr "          Yaratılış : %s"
 
-#: modules/commands/cs_entrymsg.cpp:113 modules/commands/os_forbid.cpp:346
-#: modules/commands/hs_list.cpp:58 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:380
-#: modules/commands/cs_mode.cpp:431 modules/commands/os_news.cpp:156
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_news.cpp:156 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_akill.cpp:350 modules/commands/hs_list.cpp:58
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_entrymsg.cpp:116
+#: modules/commands/cs_mode.cpp:431
 #, fuzzy
 msgid "Creator"
 msgstr "          Yaratılış : %s"
@@ -4223,7 +4213,7 @@ msgstr "GROUP hedef şifre"
 msgid "DEL [nickname] channel"
 msgstr "MODE kanaladı modlar"
 
-#: modules/commands/ns_cert.cpp:252
+#: modules/commands/ns_cert.cpp:259
 #, fuzzy
 msgid "DEL [nickname] fingerprint"
 msgstr "FORBID nick sebep"
@@ -4233,8 +4223,8 @@ msgstr "FORBID nick sebep"
 msgid "DEL [nickname] mask"
 msgstr "MODE kanaladı modlar"
 
-#: modules/commands/os_sxline.cpp:419 modules/commands/os_sxline.cpp:652
-#: modules/commands/os_akill.cpp:376
+#: modules/commands/os_akill.cpp:376 modules/commands/os_sxline.cpp:419
+#: modules/commands/os_sxline.cpp:652
 #, fuzzy
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL [kanaladı] {num | liste | ALL}"
@@ -4562,8 +4552,8 @@ msgstr ""
 msgid "Depooled %s."
 msgstr ""
 
-#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #: modules/commands/cs_access.cpp:785 modules/commands/cs_list.cpp:74
+#: modules/commands/cs_info.cpp:53 modules/commands/ns_alist.cpp:48
 #, fuzzy
 msgid "Description"
 msgstr "%s kanalının açıklaması %s olarak değiştirildi."
@@ -4723,12 +4713,12 @@ msgid ""
 "this nick."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:484
+#: modules/commands/ns_set.cpp:490
 #, c-format
 msgid "E-mail address for %s changed to %s."
 msgstr "E-mail address for %s changed to %s."
 
-#: modules/commands/ns_set.cpp:490
+#: modules/commands/ns_set.cpp:496
 #, c-format
 msgid "E-mail address for %s unset."
 msgstr "E-mail address for %s unset."
@@ -4817,7 +4807,7 @@ msgstr ""
 msgid "Enable greet messages"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:539
+#: modules/commands/ns_set.cpp:545
 msgid "Enable or disable keep modes"
 msgstr ""
 
@@ -4853,14 +4843,14 @@ msgstr ""
 "%s tarafından hatırlanır ve birisi kanala girdiğinde bu\n"
 "topic geçerli olur."
 
-#: modules/commands/ns_set.cpp:614
+#: modules/commands/ns_set.cpp:620
 msgid ""
 "Enables or disables keepmodes for the given nick. If keep\n"
 "modes is enabled, services will remember users' usermodes\n"
 "and attempt to re-set them the next time they authenticate."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:589
+#: modules/commands/ns_set.cpp:595
 msgid ""
 "Enables or disables keepmodes for your nick. If keep\n"
 "modes is enabled, services will remember your usermodes\n"
@@ -5068,7 +5058,7 @@ msgstr "Kanal listesi sonu."
 msgid "End of configuration."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:131
+#: modules/commands/cs_entrymsg.cpp:134
 #, fuzzy
 msgid "End of entry message list."
 msgstr "Kullanıcı listesi sonu."
@@ -5088,7 +5078,7 @@ msgstr "Kullanıcı listesi sonu."
 msgid "End of list - %d channels shown."
 msgstr "Liste sonu - %d/%d ."
 
-#: modules/commands/cs_list.cpp:124 modules/commands/ns_list.cpp:131
+#: modules/commands/ns_list.cpp:131 modules/commands/cs_list.cpp:124
 #, c-format
 msgid "End of list - %d/%d matches shown."
 msgstr "Liste sonu - %d/%d ."
@@ -5123,37 +5113,37 @@ msgid ""
 "user count drops below the channel limit, if one is set."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:824 modules/commands/ns_set.cpp:859
+#: modules/commands/ns_set.cpp:830 modules/commands/ns_set.cpp:865
 #: src/language.cpp:44
 msgid "English"
 msgstr "Türkçe"
 
-#: modules/commands/cs_entrymsg.cpp:167
+#: modules/commands/cs_entrymsg.cpp:170
 #, fuzzy, c-format
 msgid "Entry message %i for %s deleted."
 msgstr "Greet message for %s unset."
 
-#: modules/commands/cs_entrymsg.cpp:174
+#: modules/commands/cs_entrymsg.cpp:177
 #, fuzzy, c-format
 msgid "Entry message %s not found on channel %s."
 msgstr "Fantazi modu %s kanalında AKTİF."
 
-#: modules/commands/cs_entrymsg.cpp:144
+#: modules/commands/cs_entrymsg.cpp:147
 #, fuzzy, c-format
 msgid "Entry message added to %s"
 msgstr "Greet message for %s changed to %s."
 
-#: modules/commands/cs_entrymsg.cpp:106 modules/commands/cs_entrymsg.cpp:155
+#: modules/commands/cs_entrymsg.cpp:109 modules/commands/cs_entrymsg.cpp:158
 #, fuzzy, c-format
 msgid "Entry message list for %s is empty."
 msgstr "Access list for %s is empty."
 
-#: modules/commands/cs_entrymsg.cpp:110
+#: modules/commands/cs_entrymsg.cpp:113
 #, fuzzy, c-format
 msgid "Entry message list for %s:"
 msgstr "%s nickinin access listesi:"
 
-#: modules/commands/cs_entrymsg.cpp:184
+#: modules/commands/cs_entrymsg.cpp:187
 #, fuzzy, c-format
 msgid "Entry messages for %s have been cleared."
 msgstr "All memos for channel %s have been deleted."
@@ -5177,7 +5167,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:318
+#: modules/commands/ns_cert.cpp:325
 msgid ""
 "Examples:\n"
 " \n"
@@ -5203,12 +5193,12 @@ msgstr "%s (#%d) için exception %d pozisyonuyla değiştirildi."
 msgid "Exception for %s has been updated to %d."
 msgstr "Exception for %s has been updated to %d."
 
-#: modules/pseudoclients/nickserv.cpp:528
-#: modules/pseudoclients/nickserv.cpp:533
-#: modules/pseudoclients/chanserv.cpp:458 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:350
-#: modules/commands/ns_group.cpp:299 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/pseudoclients/nickserv.cpp:535
+#: modules/pseudoclients/nickserv.cpp:540
+#: modules/pseudoclients/chanserv.cpp:461 modules/commands/os_forbid.cpp:346
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:199 modules/commands/os_ignore.cpp:266
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Expires"
 msgstr "Expires in: %s"
@@ -5223,7 +5213,7 @@ msgstr "Exception for %s has been updated to %d."
 msgid "Expiry for %s updated."
 msgstr "%s nickinin zaman aşımı süresi değiştirildi."
 
-#: modules/fantasy.cpp:195
+#: modules/fantasy.cpp:198
 msgid "Fantasy"
 msgstr "Fantazi"
 
@@ -5242,11 +5232,16 @@ msgstr "Fantazi modu %s kanalında AKTİF."
 msgid "Find a user's status on a channel"
 msgstr "    DEOWNER    Removes your owner status on a channel"
 
-#: modules/commands/ns_cert.cpp:190
+#: modules/commands/ns_cert.cpp:192
 #, fuzzy, c-format
 msgid "Fingerprint %s already present on %s's certificate list."
 msgstr "%s access listenizde zaten var."
 
+#: modules/commands/ns_cert.cpp:198
+#, fuzzy, c-format
+msgid "Fingerprint %s is already in use."
+msgstr "You are already in %s! "
+
 #: modules/commands/cs_flags.cpp:301
 msgid "Flags"
 msgstr ""
@@ -5480,12 +5475,12 @@ msgstr "Ignore listesi boş."
 msgid "Ignore list:"
 msgstr "Bot listesi:"
 
-#: modules/commands/ns_set.cpp:1272
+#: modules/commands/ns_set.cpp:1278
 #, fuzzy
 msgid "Immediate protection"
 msgstr "Voiceları koruma"
 
-#: modules/commands/ns_resetpass.cpp:35
+#: modules/commands/ns_resetpass.cpp:33
 #, fuzzy
 msgid "Incorrect email address."
 msgstr "         E-mail adresi: %s"
@@ -5573,17 +5568,17 @@ msgstr "        Italics kicker : %s"
 msgid "Join a group"
 msgstr "    GROUP      Bir gruba dahil eder"
 
-#: modules/commands/ns_set.cpp:1286 modules/commands/cs_set.cpp:1354
+#: modules/commands/ns_set.cpp:1292 modules/commands/cs_set.cpp:1358
 #, fuzzy
 msgid "Keep modes"
 msgstr "Message mode"
 
-#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:374
+#: modules/commands/ns_set.cpp:580 modules/commands/cs_set.cpp:374
 #, fuzzy, c-format
 msgid "Keep modes for %s is now off."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:568 modules/commands/cs_set.cpp:366
+#: modules/commands/ns_set.cpp:574 modules/commands/cs_set.cpp:366
 #, fuzzy, c-format
 msgid "Keep modes for %s is now on."
 msgstr "Peace option for %s is now ON."
@@ -5602,7 +5597,7 @@ msgstr "Key for channel %s is %s."
 msgid "Kick a user from a channel"
 msgstr "    KICK        Bir kullanıcıyı kanaldan atar"
 
-#: modules/commands/cs_kick.cpp:103 modules/commands/cs_ban.cpp:195
+#: modules/commands/cs_ban.cpp:195 modules/commands/cs_kick.cpp:103
 #, c-format
 msgid "Kicked %d/%d users matching %s from %s."
 msgstr ""
@@ -5644,8 +5639,8 @@ msgstr ""
 msgid "LIST threshold"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:420 modules/commands/os_sxline.cpp:653
-#: modules/commands/os_akill.cpp:377
+#: modules/commands/os_akill.cpp:377 modules/commands/os_sxline.cpp:420
+#: modules/commands/os_sxline.cpp:653
 #, fuzzy
 msgid "LIST [mask | list | id]"
 msgstr "LIST [kanaladı] [liste | NEW]"
@@ -5655,8 +5650,8 @@ msgstr "LIST [kanaladı] [liste | NEW]"
 msgid "LIST [mask | list]"
 msgstr "LIST [kanaladı] [liste | NEW]"
 
-#: modules/commands/ns_access.cpp:104 modules/commands/ns_ajoin.cpp:233
-#: modules/commands/ns_cert.cpp:253
+#: modules/commands/ns_ajoin.cpp:233 modules/commands/ns_cert.cpp:260
+#: modules/commands/ns_access.cpp:104
 #, fuzzy
 msgid "LIST [nickname]"
 msgstr "CHECK nickname"
@@ -5665,7 +5660,7 @@ msgstr "CHECK nickname"
 msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]"
 msgstr "LOGONNEWS {ADD|DEL|LIST} [yazı|num]"
 
-#: modules/commands/ns_set.cpp:804
+#: modules/commands/ns_set.cpp:810
 msgid "Language changed to English."
 msgstr "Dil Türkçe olarak değiştirildi."
 
@@ -5679,7 +5674,7 @@ msgstr "%s nickine gönderilen son mesaj iptal edildi."
 msgid "Last quit message"
 msgstr "      Son çıkış mesajı: %s"
 
-#: modules/commands/ns_info.cpp:88 modules/commands/cs_access.cpp:468
+#: modules/commands/cs_access.cpp:468 modules/commands/ns_info.cpp:88
 #, fuzzy
 msgid "Last seen"
 msgstr "   Son görüldüğü tarih: %s"
@@ -5693,7 +5688,7 @@ msgstr "      Son görüldüğü adres: %s"
 msgid "Last topic"
 msgstr ""
 
-#: modules/commands/cs_info.cpp:56 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_akick.cpp:380 modules/commands/cs_info.cpp:56
 #, fuzzy
 msgid "Last used"
 msgstr "   Son görüldüğü tarih: %s"
@@ -5723,8 +5718,8 @@ msgstr "Level for %s on channel %s changed to founder only."
 msgid "Level must be between %d and %d inclusive."
 msgstr "Level %d ile %d arasında olmalıdır."
 
-#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_dns.cpp:217
 msgid "Limit"
 msgstr ""
 
@@ -5749,17 +5744,17 @@ msgstr ""
 msgid "List loaded modules"
 msgstr "    MODLIST     List loaded modules"
 
-#: modules/commands/cs_list.cpp:71 modules/commands/ns_list.cpp:123
+#: modules/commands/ns_list.cpp:123 modules/commands/cs_list.cpp:71
 #, fuzzy, c-format
 msgid "List of entries matching %s:"
 msgstr "%s grubundaki nicklerin listesi:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 #, c-format
 msgid "List of nicknames in the group of %s:"
 msgstr "%s grubundaki nicklerin listesi:"
 
-#: modules/commands/ns_group.cpp:311
+#: modules/commands/ns_group.cpp:338
 msgid "List of nicknames in your group:"
 msgstr "Grubunuzdaki nicklerin listesi:"
 
@@ -5815,7 +5810,7 @@ msgid ""
 "limited to Services Operators"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:271
+#: modules/commands/ns_group.cpp:287
 #, fuzzy
 msgid "Lists all nicknames in your group"
 msgstr "Grubunuzdaki nicklerin listesi:"
@@ -6309,7 +6304,7 @@ msgstr ""
 msgid "Manage DNS zones for this network"
 msgstr "E-mail adresini bu networkte silemezsiniz."
 
-#: modules/commands/cs_entrymsg.cpp:190
+#: modules/commands/cs_entrymsg.cpp:193
 #, fuzzy
 msgid "Manage the channel's entry messages"
 msgstr "    PERSIST       Set the channel as permanent"
@@ -6344,15 +6339,15 @@ msgstr "    DEFCON      Manipulate the DefCon system"
 msgid "Manipulate the topic of the specified channel"
 msgstr "    TOPIC      Manipulate the topic of the specified channel"
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/bs_info.cpp:56
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_list.cpp:147
-#: modules/commands/cs_xop.cpp:382 modules/commands/cs_flags.cpp:301
-#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
+#: modules/commands/os_forbid.cpp:346 modules/commands/bs_botlist.cpp:27
+#: modules/commands/bs_info.cpp:56 modules/commands/os_list.cpp:147
+#: modules/commands/cs_xop.cpp:382 modules/commands/ms_ignore.cpp:80
+#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
+#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_flags.cpp:301
 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
-#: modules/commands/ms_ignore.cpp:80 modules/commands/os_session.cpp:544
-#: modules/commands/os_session.cpp:552 modules/commands/os_ignore.cpp:266
 msgid "Mask"
 msgstr ""
 
@@ -6365,8 +6360,8 @@ msgstr "%s access listenizde zaten var."
 msgid "Mask must be in the form user@host."
 msgstr ""
 
-#: modules/commands/cs_xop.cpp:165 modules/commands/cs_flags.cpp:122
-#: modules/commands/cs_access.cpp:164
+#: modules/commands/cs_access.cpp:164 modules/commands/cs_xop.cpp:165
+#: modules/commands/cs_flags.cpp:122
 #, fuzzy
 msgid "Masks and unregistered users may not be on access lists."
 msgstr "%s access listenizde zaten var."
@@ -6418,7 +6413,7 @@ msgstr "%s nickinin mesaj limiti %d olarak ayarlandı."
 msgid "Memo limit for %s set to 0."
 msgstr "%s nickinin mesaj limiti 0 olarak ayarlandı."
 
-#: modules/commands/ms_send.cpp:44 modules/commands/ms_rsend.cpp:63
+#: modules/commands/ms_rsend.cpp:63 modules/commands/ms_send.cpp:44
 #, c-format
 msgid "Memo sent to %s."
 msgstr "%s nickine mesajınız gönderildi."
@@ -6428,12 +6423,12 @@ msgstr "%s nickine mesajınız gönderildi."
 msgid "Memos for %s:"
 msgstr "     Mod kilidi: %s"
 
-#: modules/commands/cs_entrymsg.cpp:113
+#: modules/commands/cs_entrymsg.cpp:116
 #, fuzzy
 msgid "Message"
 msgstr "GLOBAL mesaj"
 
-#: modules/commands/ns_set.cpp:1280
+#: modules/commands/ns_set.cpp:1286
 msgid "Message mode"
 msgstr "Message mode"
 
@@ -6517,7 +6512,7 @@ msgstr ""
 "    ACCESS LIST\n"
 "        Mevcut access listesini görüntüler."
 
-#: modules/commands/ns_cert.cpp:312
+#: modules/commands/ns_cert.cpp:319
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -6542,12 +6537,12 @@ msgstr "    AOP        AOP listesini düzenler"
 msgid "Modify the list of authorized addresses"
 msgstr "    ACCESS     İzinli adreslerin listesini düzenler"
 
-#: modules/commands/cs_flags.cpp:373 modules/commands/cs_access.cpp:494
+#: modules/commands/cs_access.cpp:494 modules/commands/cs_flags.cpp:373
 #, fuzzy
 msgid "Modify the list of privileged users"
 msgstr "    ACCESS     Ayrıcalıklı kullanıcıları belirler değiştirir"
 
-#: modules/commands/ns_cert.cpp:250
+#: modules/commands/ns_cert.cpp:257
 #, fuzzy
 msgid "Modify the nickname client certificate list"
 msgstr "    IGNORE      Modify the Services ignore list"
@@ -6601,10 +6596,10 @@ msgstr "Module: %s Version: %s Author: %s loaded: %s"
 msgid "Module: %s [%s] [%s]"
 msgstr "Module: %s [%s] [%s]"
 
-#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
 #: modules/commands/cs_access.cpp:691 modules/commands/cs_access.cpp:785
-#: modules/commands/cs_list.cpp:74 modules/commands/os_config.cpp:66
-#: modules/commands/os_config.cpp:88
+#: modules/commands/os_list.cpp:42 modules/commands/os_list.cpp:147
+#: modules/commands/os_config.cpp:66 modules/commands/os_config.cpp:88
+#: modules/commands/cs_list.cpp:74
 msgid "Name"
 msgstr ""
 
@@ -6621,9 +6616,9 @@ msgstr "%s nickinin access listesi:"
 msgid "Never"
 msgstr ""
 
-#: modules/commands/bs_botlist.cpp:27 modules/commands/hs_list.cpp:58
-#: modules/commands/hs_request.cpp:300 modules/commands/ns_list.cpp:75
-#: modules/commands/ns_group.cpp:299
+#: modules/commands/bs_botlist.cpp:27 modules/commands/ns_list.cpp:75
+#: modules/commands/hs_list.cpp:58 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_group.cpp:315
 #, fuzzy
 msgid "Nick"
 msgstr "INFO nick"
@@ -6688,12 +6683,12 @@ msgstr "Nickname %s registered."
 msgid "Nick %s was truncated to %d characters."
 msgstr "Nick %s was truncated to %d characters."
 
-#: modules/commands/ns_set.cpp:1103
+#: modules/commands/ns_set.cpp:1109
 #, c-format
 msgid "Nick %s will expire."
 msgstr "Nick %s will expire."
 
-#: modules/commands/ns_set.cpp:1097
+#: modules/commands/ns_set.cpp:1103
 #, c-format
 msgid "Nick %s will not expire."
 msgstr "Nick %s will not expire."
@@ -6708,7 +6703,7 @@ msgstr "Nick %s doesn't have a memo from you."
 msgid "Nick %s has been logged out."
 msgstr "%s nickinin çıkışı yapıldı."
 
-#: modules/commands/ns_group.cpp:244
+#: modules/commands/ns_group.cpp:260
 #, c-format
 msgid "Nick %s has been ungrouped from %s."
 msgstr "Nick %s has been ungrouped from %s."
@@ -6718,7 +6713,7 @@ msgstr "Nick %s has been ungrouped from %s."
 msgid "Nick %s is currently suspended."
 msgstr "Nick %s is now suspended."
 
-#: modules/commands/ns_group.cpp:223
+#: modules/commands/ns_group.cpp:239
 #, fuzzy, c-format
 msgid "Nick %s is not in your group."
 msgstr "The nick %s is not in your group."
@@ -6758,17 +6753,17 @@ msgstr "%s kanalı zaten kayıtlı!"
 msgid "Nickname %s may not be registered."
 msgstr "%s kanalı kayıt edilemez."
 
-#: modules/commands/ns_register.cpp:210
+#: modules/commands/ns_register.cpp:204
 #, fuzzy, c-format
 msgid "Nickname %s registered under your user@host-mask: %s"
 msgstr "%s nicki sizin adınıza kayıt edildi: %s"
 
-#: modules/commands/ns_register.cpp:212
+#: modules/commands/ns_register.cpp:206
 #, fuzzy, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
-#: modules/commands/cs_set.cpp:1356
+#: modules/commands/cs_set.cpp:1360
 #, fuzzy
 msgid "No auto-op"
 msgstr "Auto-op"
@@ -6777,7 +6772,7 @@ msgstr "Auto-op"
 msgid "No bot"
 msgstr "Bot yok"
 
-#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1352
+#: modules/commands/ns_set.cpp:1290 modules/commands/cs_set.cpp:1356
 #, fuzzy
 msgid "No expire"
 msgstr "zaman aşımı yok"
@@ -6811,8 +6806,8 @@ msgstr "No Emails listed for %s."
 msgid "No matching entries on %s %s list."
 msgstr "%s kanali AOP listesinde uyusan kayit bulunamadi."
 
-#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #: modules/commands/cs_access.cpp:265 modules/commands/cs_access.cpp:429
+#: modules/commands/cs_xop.cpp:433 modules/commands/cs_flags.cpp:335
 #, c-format
 msgid "No matching entries on %s access list."
 msgstr "Uyuşan kayıt %s kanalının access listesinde yok."
@@ -6883,8 +6878,8 @@ msgstr ""
 msgid "No signed kick when SIGNKICK LEVEL is used"
 msgstr ""
 
-#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #: modules/extra/stats/cs_fantasy_top.cpp:159
+#: modules/extra/stats/cs_fantasy_stats.cpp:156
 #, fuzzy, c-format
 msgid "No stats for %s."
 msgstr "%s nickinin access listesi:"
@@ -6894,7 +6889,7 @@ msgstr "%s nickinin access listesi:"
 msgid "No such info \"%s\" on %s."
 msgstr "%s has been invited to %s."
 
-#: modules/commands/cs_kick.cpp:105 modules/commands/cs_ban.cpp:197
+#: modules/commands/cs_ban.cpp:197 modules/commands/cs_kick.cpp:105
 #, fuzzy, c-format
 msgid "No users on %s match %s."
 msgstr "Changed usermodes of %s."
@@ -6922,17 +6917,17 @@ msgstr "YOK"
 msgid "Nothing to do."
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/ms_list.cpp:64 modules/commands/cs_entrymsg.cpp:113
-#: modules/commands/ns_alist.cpp:48 modules/commands/hs_list.cpp:58
-#: modules/commands/ns_ajoin.cpp:100 modules/commands/cs_xop.cpp:382
-#: modules/commands/cs_flags.cpp:301 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/hs_request.cpp:300
-#: modules/commands/cs_access.cpp:455 modules/commands/cs_access.cpp:468
-#: modules/commands/bs_badwords.cpp:193 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_news.cpp:156
-#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552
-#: modules/commands/cs_log.cpp:127
+#: modules/commands/os_news.cpp:156 modules/commands/cs_access.cpp:455
+#: modules/commands/cs_access.cpp:468 modules/commands/bs_badwords.cpp:193
+#: modules/commands/cs_xop.cpp:382 modules/commands/os_session.cpp:544
+#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:336
+#: modules/commands/os_akill.cpp:350 modules/commands/os_sxline.cpp:191
+#: modules/commands/os_sxline.cpp:199 modules/commands/cs_log.cpp:127
+#: modules/commands/ns_ajoin.cpp:100 modules/commands/hs_list.cpp:58
+#: modules/commands/cs_flags.cpp:301 modules/commands/ms_list.cpp:64
+#: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380
+#: modules/commands/cs_entrymsg.cpp:116 modules/commands/hs_request.cpp:300
+#: modules/commands/ns_alist.cpp:48
 msgid "Number"
 msgstr ""
 
@@ -7058,12 +7053,12 @@ msgstr "%s nickinin şifresi %s."
 msgid "Password incorrect."
 msgstr "Şifre geçersiz."
 
-#: modules/commands/ns_resetpass.cpp:41
+#: modules/commands/ns_resetpass.cpp:39
 #, c-format
 msgid "Password reset email for %s has been sent."
 msgstr "Password reset email for %s has been sent."
 
-#: modules/commands/cs_set.cpp:1338
+#: modules/commands/cs_set.cpp:1342
 msgid "Peace"
 msgstr "Baris"
 
@@ -7077,7 +7072,7 @@ msgstr "Peace option for %s is now ON."
 msgid "Peace option for %s is now on."
 msgstr "Peace option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1350
+#: modules/commands/cs_set.cpp:1354
 #, fuzzy
 msgid "Persistent"
 msgstr "Persistant"
@@ -7113,17 +7108,17 @@ msgstr "Lütfen %d saniye bekleyin ve tekrar deneyin."
 msgid "Please wait %d seconds before requesting a new vHost."
 msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
 
-#: modules/commands/ms_send.cpp:48 modules/commands/ms_rsend.cpp:58
+#: modules/commands/ms_rsend.cpp:58 modules/commands/ms_send.cpp:48
 #, fuzzy, c-format
 msgid "Please wait %d seconds before using the %s command again."
 msgstr "Lütfen %d saniye SEND komutunu tekrar kullanmak için bekleyin."
 
-#: modules/commands/ns_group.cpp:120
+#: modules/commands/ns_group.cpp:136
 #, 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/commands/ns_register.cpp:180
+#: modules/commands/ns_register.cpp:174
 #, 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."
@@ -7171,7 +7166,7 @@ msgstr ""
 "    PRIVATE    Prevent the nickname from appearing in a\n"
 "                   /msg %s LIST"
 
-#: modules/commands/ns_set.cpp:1072
+#: modules/commands/ns_set.cpp:1078
 #, fuzzy
 msgid "Prevent the nickname from expiring"
 msgstr "    NOEXPIRE   Prevent the nickname from expiring"
@@ -7180,8 +7175,8 @@ msgstr "    NOEXPIRE   Prevent the nickname from expiring"
 msgid "Prevents users being kicked by Services"
 msgstr ""
 
-#: modules/commands/bs_info.cpp:59 modules/commands/cs_list.cpp:256
-#: modules/commands/ns_list.cpp:297
+#: modules/commands/bs_info.cpp:59 modules/commands/ns_list.cpp:297
+#: modules/commands/cs_list.cpp:256
 msgid "Private"
 msgstr "Özel"
 
@@ -7225,26 +7220,26 @@ msgstr ""
 msgid "Privilege %s removed from %s on %s, new flags are +%s"
 msgstr ""
 
-#: modules/commands/ns_set.cpp:1276
+#: modules/commands/ns_set.cpp:1282
 msgid "Protection"
 msgstr "Kill koruması"
 
-#: modules/commands/ns_set.cpp:692
+#: modules/commands/ns_set.cpp:698
 #, fuzzy, c-format
 msgid "Protection is now off for %s."
 msgstr "Protection is now ON for %s."
 
-#: modules/commands/ns_set.cpp:671
+#: modules/commands/ns_set.cpp:677
 #, 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/commands/ns_set.cpp:681
+#: modules/commands/ns_set.cpp:687
 #, fuzzy, c-format
 msgid "Protection is now on for %s, with no delay."
 msgstr "Protection is now ON for %s, with no delay."
 
-#: modules/commands/ns_set.cpp:663
+#: modules/commands/ns_set.cpp:669
 #, fuzzy, c-format
 msgid "Protection is now on for %s."
 msgstr "Protection is now ON for %s."
@@ -7261,7 +7256,7 @@ msgstr ""
 "uses the entire and complete real ident@host for every nick,\n"
 "then enforces the AKILL. "
 
-#: modules/commands/ns_set.cpp:1274
+#: modules/commands/ns_set.cpp:1280
 #, fuzzy
 msgid "Quick protection"
 msgstr "Voiceları koruma"
@@ -7307,11 +7302,11 @@ msgstr "    READ   Mesajları okumanızı sağlar"
 msgid "Real name"
 msgstr "        Gerçek ismi : %s"
 
+#: modules/commands/os_forbid.cpp:346 modules/commands/os_session.cpp:552
+#: modules/commands/os_akill.cpp:336 modules/commands/os_akill.cpp:350
 #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199
-#: modules/commands/os_forbid.cpp:346 modules/commands/os_akill.cpp:336
-#: modules/commands/os_akill.cpp:350 modules/commands/cs_akick.cpp:367
-#: modules/commands/cs_akick.cpp:380 modules/commands/os_session.cpp:552
-#: modules/commands/os_ignore.cpp:266
+#: modules/commands/os_ignore.cpp:266 modules/commands/cs_akick.cpp:367
+#: modules/commands/cs_akick.cpp:380
 msgid "Reason"
 msgstr ""
 
@@ -7342,14 +7337,14 @@ msgstr ""
 "    RELEASE    RECOVER komutundan sonra nickinizi serbest \n"
 "               bırakır"
 
-#: modules/commands/os_sxline.cpp:324 modules/commands/os_sxline.cpp:538
-#: modules/commands/os_akill.cpp:129
+#: modules/commands/os_akill.cpp:129 modules/commands/os_sxline.cpp:324
+#: modules/commands/os_sxline.cpp:538
 #, fuzzy
 msgid "Regex is disabled."
 msgstr "%s is enable"
 
-#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684
-#: modules/commands/os_akill.cpp:433
+#: modules/commands/os_akill.cpp:433 modules/commands/os_sxline.cpp:452
+#: modules/commands/os_sxline.cpp:684
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7357,8 +7352,8 @@ msgid ""
 msgstr ""
 
 #: modules/commands/os_forbid.cpp:416 modules/commands/os_list.cpp:114
-#: modules/commands/os_list.cpp:225 modules/commands/cs_list.cpp:161
-#: modules/commands/ns_list.cpp:172 modules/commands/os_ignore.cpp:386
+#: modules/commands/os_list.cpp:225 modules/commands/ns_list.cpp:172
+#: modules/commands/cs_list.cpp:161 modules/commands/os_ignore.cpp:386
 #, c-format
 msgid ""
 "Regex matches are also supported using the %s engine.\n"
@@ -7434,7 +7429,7 @@ msgstr ""
 "first registered your nickname.  If you haven't,\n"
 "/msg %s HELP for information on how to do so."
 
-#: modules/commands/ns_register.cpp:241
+#: modules/commands/ns_register.cpp:238
 #, fuzzy, c-format
 msgid ""
 "Registers your nickname in the %s database. Once\n"
@@ -7536,7 +7531,7 @@ msgstr "    MODLOAD     Load a module"
 msgid "Reload services' configuration file"
 msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
 
-#: modules/commands/ns_group.cpp:207
+#: modules/commands/ns_group.cpp:223
 #, fuzzy
 msgid "Remove a nick from a group"
 msgstr "    UNGROUP    Remove a nick from a group"
@@ -7614,7 +7609,7 @@ msgid ""
 "is being considered."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:284
+#: modules/commands/ns_register.cpp:281
 #, fuzzy
 msgid "Resend registration confirmation email"
 msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
@@ -7624,7 +7619,7 @@ msgstr "    RELOAD      Servislerin conf dosyasını yeniden yükler"
 msgid "Restrict access to the channel"
 msgstr "    RESTRICTED    Kanala izinli giriş gerektirir"
 
-#: modules/commands/cs_set.cpp:1340
+#: modules/commands/cs_set.cpp:1344
 #, fuzzy
 msgid "Restricted access"
 msgstr "Kisitli Erisim."
@@ -7774,12 +7769,12 @@ msgstr "NOOP {SET|REVOKE} server"
 msgid "SET server.name option value"
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:364
+#: modules/commands/ns_cert.cpp:371
 #, fuzzy, c-format
 msgid "SSL certificate fingerprint accepted, you are now identified to %s."
 msgstr "Şifre kabul edildi."
 
-#: modules/commands/ns_cert.cpp:375
+#: modules/commands/ns_cert.cpp:382
 #, fuzzy
 msgid "SSL certificate fingerprint accepted, you are now identified."
 msgstr "Şifre kabul edildi."
@@ -7804,7 +7799,7 @@ msgstr ""
 msgid "Searches logs for a matching pattern"
 msgstr ""
 
-#: modules/commands/cs_set.cpp:1344
+#: modules/commands/cs_set.cpp:1348
 #, fuzzy
 msgid "Secure founder"
 msgstr "Secure Founder"
@@ -7819,7 +7814,7 @@ msgstr "Secure founder option for %s is now ON."
 msgid "Secure founder option for %s is now on."
 msgstr "Secure founder option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1346
+#: modules/commands/cs_set.cpp:1350
 #, fuzzy
 msgid "Secure ops"
 msgstr "Secure Ops"
@@ -7844,12 +7839,12 @@ msgstr "Secure option for %s is now ON."
 msgid "Secure option for %s is now on."
 msgstr "Secure option for %s is now ON."
 
-#: modules/commands/ns_set.cpp:1012
+#: modules/commands/ns_set.cpp:1018
 #, fuzzy, c-format
 msgid "Secure option is now off for %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1006
+#: modules/commands/ns_set.cpp:1012
 #, fuzzy, c-format
 msgid "Secure option is now on for %s."
 msgstr "Secure option is now ON for %s."
@@ -7859,7 +7854,7 @@ msgstr "Secure option is now ON for %s."
 msgid "Secureops enforced on %s."
 msgstr "Secure option is now ON for %s."
 
-#: modules/commands/ns_set.cpp:1278 modules/commands/cs_set.cpp:1342
+#: modules/commands/ns_set.cpp:1284 modules/commands/cs_set.cpp:1346
 msgid "Security"
 msgstr "Güvenlik"
 
@@ -7911,7 +7906,7 @@ msgstr "Secure Founder"
 msgid "Sends a memo and requests a read receipt"
 msgstr "    RSEND  Sends a memo and requests a read receipt"
 
-#: modules/commands/ns_resetpass.cpp:52
+#: modules/commands/ns_resetpass.cpp:50
 #, fuzzy
 msgid ""
 "Sends a passcode to the nickname with instructions on how to\n"
@@ -8168,12 +8163,12 @@ msgstr "Services will no longer autoop %s in channels."
 msgid "Services will now automatically give modes to users in %s."
 msgstr "Services will now autoop %s in channels."
 
-#: modules/commands/ns_set.cpp:908
+#: modules/commands/ns_set.cpp:914
 #, c-format
 msgid "Services will now reply to %s with messages."
 msgstr "Services will now reply to %s with messages."
 
-#: modules/commands/ns_set.cpp:914
+#: modules/commands/ns_set.cpp:920
 #, c-format
 msgid "Services will now reply to %s with notices."
 msgstr "Services will now reply to %s with notices."
@@ -8246,7 +8241,7 @@ msgstr "    DISPLAY    Grubunuzun servislerde nasıl görüneceğini ayarlar"
 msgid "Set the founder of a channel"
 msgstr "    FOUNDER       Kanal founderını belirler"
 
-#: modules/commands/ns_set.cpp:764
+#: modules/commands/ns_set.cpp:770
 #, fuzzy
 msgid "Set the language Services will use when messaging you"
 msgstr ""
@@ -8654,7 +8649,7 @@ msgstr ""
 "Set to ON to allow ChanServ to op the given nickname \n"
 "automatically when joining channels."
 
-#: modules/commands/ns_set.cpp:1113
+#: modules/commands/ns_set.cpp:1119
 #, fuzzy
 msgid ""
 "Sets whether the given nickname will expire.  Setting this\n"
@@ -8745,11 +8740,11 @@ msgstr ""
 msgid "Signed kick option for %s is now on."
 msgstr "Signed kick option for %s is now ON."
 
-#: modules/commands/cs_set.cpp:1348
+#: modules/commands/cs_set.cpp:1352
 msgid "Signed kicks"
 msgstr "İşaretli atma"
 
-#: modules/commands/ms_send.cpp:50 modules/commands/ms_rsend.cpp:60
+#: modules/commands/ms_rsend.cpp:60 modules/commands/ms_send.cpp:50
 #, fuzzy, c-format
 msgid "Sorry, %s currently has too many memos and cannot receive more."
 msgstr "%s nickinin limiti dolduğundan daha fazla mesaj alamaz."
@@ -8764,12 +8759,12 @@ msgstr ""
 msgid "Sorry, bot assignment is temporarily disabled."
 msgstr "Bot özellik ayarı geçici olarak devre dışı."
 
-#: modules/commands/bs_assign.cpp:164 modules/commands/bs_bot.cpp:273
+#: modules/commands/bs_bot.cpp:273 modules/commands/bs_assign.cpp:164
 msgid "Sorry, bot modification is temporarily disabled."
 msgstr "Botta değişiklik yapma geçici olarak devre dışı."
 
-#: modules/fantasy.cpp:42 modules/commands/bs_set.cpp:103
-#: modules/commands/bs_kick.cpp:802 modules/commands/bs_kick.cpp:867
+#: modules/fantasy.cpp:42 modules/commands/bs_kick.cpp:802
+#: modules/commands/bs_kick.cpp:867 modules/commands/bs_set.cpp:103
 msgid "Sorry, bot option setting is temporarily disabled."
 msgstr "Bot özellik ayarı geçici olarak devre dışı."
 
@@ -8779,7 +8774,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/commands/cs_flags.cpp:403 modules/commands/cs_access.cpp:541
+#: modules/commands/cs_access.cpp:541 modules/commands/cs_flags.cpp:403
 msgid "Sorry, channel access list modification is temporarily disabled."
 msgstr "Kanal access listesinin değiştirilmesi geçici olarak devre dışıdır."
 
@@ -8816,7 +8811,7 @@ msgstr "MemoServ'ün SET komutu geçici olarak devre dışıdır."
 msgid "Sorry, nickname de-registration is temporarily disabled."
 msgstr "Nick kaydı silinmesi geçici olarak devre dışıdır."
 
-#: modules/commands/ns_group.cpp:91
+#: modules/commands/ns_group.cpp:107
 msgid "Sorry, nickname grouping is temporarily disabled."
 msgstr "Nick gruplama geçici olarak devre dışı."
 
@@ -8834,13 +8829,13 @@ msgstr "Kanalda sadece %d tane access kaydı olabilir."
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr ""
 
-#: modules/commands/ns_cert.cpp:170
+#: modules/commands/ns_cert.cpp:173
 #, fuzzy, c-format
 msgid "Sorry, the maximum of %d certificate entries has been reached."
 msgstr "Bir nick için sadece %d tane access girilebilir."
 
-#: modules/commands/cs_xop.cpp:201 modules/commands/cs_flags.cpp:173
-#: modules/commands/cs_access.cpp:199
+#: modules/commands/cs_access.cpp:199 modules/commands/cs_xop.cpp:201
+#: modules/commands/cs_flags.cpp:173
 #, fuzzy, c-format
 msgid ""
 "Sorry, you can only have %d access entries on a channel, including access "
@@ -8976,7 +8971,7 @@ msgid ""
 "they should have based on their access."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:32
+#: modules/commands/hs_group.cpp:42
 #, fuzzy
 msgid "Syncs the vhost for all nicks in a group"
 msgstr "    GROUP       Syncs the vhost for all nicks in a group"
@@ -8985,7 +8980,7 @@ msgstr "    GROUP       Syncs the vhost for all nicks in a group"
 msgid "Syntax"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:334
+#: modules/commands/ns_group.cpp:361
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s\n"
@@ -8996,7 +8991,7 @@ msgstr ""
 "\n"
 "Lists all nicks in your group."
 
-#: modules/commands/ns_group.cpp:324
+#: modules/commands/ns_group.cpp:351
 #, fuzzy, c-format
 msgid ""
 "Syntax: %s [nickname]\n"
@@ -9223,7 +9218,7 @@ msgstr ""
 "tanıtılmanızı gerektirir. Şifreniz nickinizi kayıt ederken \n"
 "REGISTER komutuyla beraber kullandığınızla aynıdır."
 
-#: modules/commands/cs_invite.cpp:90
+#: modules/commands/cs_invite.cpp:91
 #, fuzzy, c-format
 msgid ""
 "Tells %s to invite you or an optionally specified\n"
@@ -9404,21 +9399,21 @@ msgstr ""
 "Access ile xOP arasinda geçis yapabilmek için gerekli bilgilere\n"
 "/msg %s HELP SET XOP yazarak ulasabilirsiniz."
 
-#: modules/commands/cs_entrymsg.cpp:238
+#: modules/commands/cs_entrymsg.cpp:241
 msgid ""
 "The ENTRYMSG ADD command adds the given message to\n"
 "the list of messages to be shown to users when they join\n"
 "the channel."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:250
+#: modules/commands/cs_entrymsg.cpp:253
 msgid ""
 "The ENTRYMSG CLEAR command clears all entries from\n"
 "the list of messages to be shown to users when they join\n"
 "the channel, effectively disabling entry messages."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:242
+#: modules/commands/cs_entrymsg.cpp:245
 msgid ""
 "The ENTRYMSG DEL command removes the given message from\n"
 "the list of messages to be shown to users when they join\n"
@@ -9426,13 +9421,13 @@ msgid ""
 "which you can get by listing the messages as explained below."
 msgstr ""
 
-#: modules/commands/cs_entrymsg.cpp:247
+#: modules/commands/cs_entrymsg.cpp:250
 msgid ""
 "The ENTRYMSG LIST command displays a listing of messages\n"
 "to be shown to users when they join the channel."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:684
+#: modules/commands/ns_set.cpp:690
 msgid "The IMMED option is not available on this network."
 msgstr "HEMEN seçeneği bu networkte aktif değil."
 
@@ -9514,7 +9509,7 @@ msgid ""
 "The STATS command prints out statistics about stored nicks and memory usage."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:263
+#: modules/commands/ns_register.cpp:260
 #, fuzzy
 msgid ""
 "The email parameter is optional and will set the email\n"
@@ -9595,7 +9590,17 @@ msgstr ""
 "set of restrictions to services useful during an attempted\n"
 "attack on the network."
 
-#: modules/commands/cs_entrymsg.cpp:139
+#: modules/ns_maxemail.cpp:30
+#, c-format
+msgid "The email address %s has reached its usage limit of %d users."
+msgstr ""
+
+#: modules/ns_maxemail.cpp:28
+#, c-format
+msgid "The email address %s has reached its usage limit of 1 user."
+msgstr ""
+
+#: modules/commands/cs_entrymsg.cpp:142
 #, fuzzy, c-format
 msgid "The entry message list for %s is full."
 msgstr "Greet message for %s unset."
@@ -9604,15 +9609,6 @@ msgstr "Greet message for %s unset."
 msgid "The following feature/function names are available:"
 msgstr ""
 
-#: modules/ns_maxemail.cpp:30
-#, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-
-#: modules/ns_maxemail.cpp:28
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-
 #: modules/commands/cs_access.cpp:578
 msgid ""
 "The given mask may also be a channel, which will use the\n"
@@ -9745,7 +9741,7 @@ msgstr ""
 msgid "There are no forbids of type %s."
 msgstr "There are %d memos on channel %s."
 
-#: modules/commands/ns_group.cpp:133
+#: modules/commands/ns_group.cpp:149
 #, fuzzy
 msgid "There are too many nicks in your group."
 msgstr "    DELALL      Delete the vhost for all nicks in a group"
@@ -9841,7 +9837,7 @@ msgid ""
 "zones."
 msgstr ""
 
-#: modules/commands/hs_group.cpp:62
+#: modules/commands/hs_group.cpp:72
 #, fuzzy
 msgid ""
 "This command allows users to set the vhost of their\n"
@@ -9854,7 +9850,7 @@ msgstr ""
 "CURRENT nick to be the vhost for all nicks in the same\n"
 "group."
 
-#: modules/commands/ns_register.cpp:271
+#: modules/commands/ns_register.cpp:268
 msgid ""
 "This command also creates a new group for your nickname,\n"
 "that will allow you to register other nicks later sharing\n"
@@ -9930,7 +9926,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/commands/ns_group.cpp:172
+#: modules/commands/ns_group.cpp:188
 #, fuzzy
 msgid ""
 "This command makes your nickname join the target nickname's\n"
@@ -9997,7 +9993,7 @@ msgid ""
 "auto join lists."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:640
+#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:646
 msgid ""
 "This command may not be used on this network because nickname ownership is "
 "disabled."
@@ -10039,7 +10035,7 @@ msgid ""
 "access entries on the channel."
 msgstr ""
 
-#: modules/commands/ns_group.cpp:257
+#: modules/commands/ns_group.cpp:273
 #, fuzzy
 msgid ""
 "This command ungroups your nick, or if given, the specificed nick,\n"
@@ -10063,7 +10059,7 @@ msgstr ""
 "This command loads the module named FileName from the modules\n"
 "directory."
 
-#: modules/commands/ns_register.cpp:325
+#: modules/commands/ns_register.cpp:322
 msgid "This command will resend you the registration confirmation email."
 msgstr ""
 
@@ -10191,12 +10187,12 @@ msgstr "Lütfen büyük harf kullanmayın!"
 msgid "Turn chanstats statistics on or off"
 msgstr "    SECURE     Nick güvenliğini açar kapatır"
 
-#: modules/commands/ns_set.cpp:977
+#: modules/commands/ns_set.cpp:983
 #, fuzzy
 msgid "Turn nickname security on or off"
 msgstr "    SECURE     Nick güvenliğini açar kapatır"
 
-#: modules/commands/ns_set.cpp:626
+#: modules/commands/ns_set.cpp:632
 #, fuzzy
 msgid "Turn protection on or off"
 msgstr "    KILL       Korumayı açar kapatır"
@@ -10234,7 +10230,7 @@ msgstr ""
 "gözükmeyecektir.(Buna rağmen, nickinizi bilen biri INFO \n"
 "komutunu kullanarak hakkınızda bilgi alabilir.)"
 
-#: modules/commands/ns_set.cpp:1027 modules/commands/ns_set.cpp:1056
+#: modules/commands/ns_set.cpp:1033 modules/commands/ns_set.cpp:1062
 #, fuzzy, c-format
 msgid ""
 "Turns %s's security features on or off for your\n"
@@ -10265,7 +10261,7 @@ msgstr "    SECURE     Nick güvenliğini açar kapatır"
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "    SECURE     Nick güvenliğini açar kapatır"
 
-#: modules/commands/ns_set.cpp:743
+#: modules/commands/ns_set.cpp:749
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for the nick\n"
@@ -10296,7 +10292,7 @@ msgstr ""
 "do not use this option unless necessary.  Also, your\n"
 "network's administrators may have disabled this option."
 
-#: modules/commands/ns_set.cpp:709
+#: modules/commands/ns_set.cpp:715
 #, fuzzy, c-format
 msgid ""
 "Turns the automatic protection option for your nick\n"
@@ -10373,7 +10369,7 @@ msgstr ""
 "Belirli bir özellik hakkında daha fazla bilgi için\n"
 "/msg %s HELP özellik yazın."
 
-#: modules/pseudoclients/nickserv.cpp:335
+#: modules/pseudoclients/nickserv.cpp:342
 #, fuzzy, c-format
 msgid ""
 "Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
@@ -10389,8 +10385,8 @@ msgstr ""
 msgid "Un-Load a module"
 msgstr "    MODUNLOAD   Un-Load a module"
 
-#: modules/commands/os_sxline.cpp:331 modules/commands/os_sxline.cpp:545
-#: modules/commands/os_akill.cpp:136
+#: modules/commands/os_akill.cpp:136 modules/commands/os_sxline.cpp:331
+#: modules/commands/os_sxline.cpp:545
 #, fuzzy, c-format
 msgid "Unable to find regex engine %s."
 msgstr "Unable to remove module %s"
@@ -10613,8 +10609,8 @@ msgstr "vhost for group %s set to %s@%s."
 msgid "VIEW host"
 msgstr ""
 
-#: modules/commands/os_sxline.cpp:421 modules/commands/os_sxline.cpp:654
-#: modules/commands/os_akill.cpp:378
+#: modules/commands/os_akill.cpp:378 modules/commands/os_sxline.cpp:421
+#: modules/commands/os_sxline.cpp:654
 #, fuzzy
 msgid "VIEW [mask | list | id]"
 msgstr "LIST [kanaladı] [liste | NEW]"
@@ -10763,12 +10759,12 @@ msgstr ""
 msgid "Word"
 msgstr ""
 
-#: modules/commands/ns_group.cpp:127
+#: modules/commands/ns_group.cpp:143
 #, c-format
 msgid "You are already a member of the group of %s."
 msgstr "%s grubunun zaten bir üyesisiniz."
 
-#: modules/commands/ns_identify.cpp:82 modules/commands/os_login.cpp:35
+#: modules/commands/os_login.cpp:35 modules/commands/ns_identify.cpp:82
 msgid "You are already identified."
 msgstr "You are already identified."
 
@@ -10796,6 +10792,11 @@ msgstr "Mesaj limitinizi belirlemeye izinli değilsiniz."
 msgid "You are not permitted to change your memo limit."
 msgstr "Mesaj limitinizi belirlemeye izinli değilsiniz."
 
+#: modules/commands/ns_cert.cpp:183
+#, fuzzy
+msgid "You are not using a client certificate."
+msgstr "You are already identified."
+
 #: modules/commands/os_set.cpp:85
 #, fuzzy
 msgid "You are now a super admin."
@@ -10805,7 +10806,7 @@ msgstr "You are now a SuperAdmin"
 msgid "You are now an IRC Operator."
 msgstr "You are now an IRC Operator."
 
-#: modules/commands/ns_resetpass.cpp:110
+#: modules/commands/ns_resetpass.cpp:108
 #, fuzzy
 msgid "You are now identified for your nick. Change your password now."
 msgstr ""
@@ -10869,8 +10870,8 @@ msgstr "You can not unassign bots while persist is set on the channel."
 msgid "You can't %s yourself!"
 msgstr "Kendinizi ghost edemezsiniz!"
 
-#: modules/commands/cs_xop.cpp:154 modules/commands/cs_flags.cpp:111
-#: modules/commands/cs_access.cpp:153
+#: modules/commands/cs_access.cpp:153 modules/commands/cs_xop.cpp:154
+#: modules/commands/cs_flags.cpp:111
 #, fuzzy
 msgid "You can't add a channel to its own access list."
 msgstr "Uyuşan kayıt %s kanalının access listesinde yok."
@@ -10880,7 +10881,7 @@ msgstr "Uyuşan kayıt %s kanalının access listesinde yok."
 msgid "You can't logout %s, they are a Services Operator."
 msgstr "Can't logout %s because he's a Services Operator."
 
-#: modules/commands/ns_set.cpp:895
+#: modules/commands/ns_set.cpp:901
 #, fuzzy, c-format
 msgid "You cannot %s on this network."
 msgstr "E-mail adresini bu networkte silemezsiniz."
@@ -10895,7 +10896,7 @@ msgstr "%s nickinin mesaj limitini %d sayısından daha fazla yapamazsınız."
 msgid "You cannot set your memo limit higher than %d."
 msgstr "Mesaj limitinizi %d sayısından daha fazla yapamazsınız."
 
-#: modules/commands/ns_set.cpp:454
+#: modules/commands/ns_set.cpp:460
 msgid "You cannot unset the e-mail on this network."
 msgstr "E-mail adresini bu networkte silemezsiniz."
 
@@ -10966,7 +10967,12 @@ msgid ""
 "Type %s%s READ %d to read it."
 msgstr "Okumak için /msg %s READ %d yazın."
 
-#: modules/commands/cs_invite.cpp:82
+#: modules/commands/cs_invite.cpp:76
+#, fuzzy, c-format
+msgid "You have been invited to %s by %s."
+msgstr "You have been invited to %s."
+
+#: modules/commands/cs_invite.cpp:81
 #, c-format
 msgid "You have been invited to %s."
 msgstr "You have been invited to %s."
@@ -11024,11 +11030,16 @@ msgstr "    DELALL      Delete the vhost for all nicks in a group"
 msgid "You may not (un)lock mode %c."
 msgstr ""
 
-#: modules/commands/ns_set.cpp:459
+#: modules/commands/ns_set.cpp:465
 #, fuzzy
 msgid "You may not change the e-mail of other Services Operators."
 msgstr "E-mail adresini bu networkte silemezsiniz."
 
+#: modules/commands/ns_set.cpp:454
+#, fuzzy
+msgid "You may not change the email of an unconfirmed account."
+msgstr "E-mail adresini bu networkte silemezsiniz."
+
 #: modules/commands/ns_set.cpp:191
 #, fuzzy
 msgid "You may not change the password of other Services Operators."
@@ -11055,7 +11066,7 @@ msgid ""
 "You may view but not modify the access list of other Services Operators."
 msgstr "Can't logout %s because he's a Services Operator."
 
-#: modules/commands/ns_cert.cpp:285
+#: modules/commands/ns_cert.cpp:292
 #, fuzzy
 msgid ""
 "You may view but not modify the certificate list of other Services Operators."
@@ -11090,7 +11101,7 @@ msgid ""
 " %s."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:143
+#: modules/commands/ns_register.cpp:137
 #, 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."
@@ -11100,7 +11111,7 @@ msgstr "You have to be connected longer than %d seconds to register your nick."
 msgid "You must have the %s(ME) privilege on the channel to use this command."
 msgstr "You need to be identified to use this command."
 
-#: modules/pseudoclients/nickserv.cpp:332
+#: modules/pseudoclients/nickserv.cpp:339
 msgid ""
 "You must now supply an e-mail for your nick.\n"
 "This e-mail will allow you to retrieve your password in\n"
@@ -11110,11 +11121,6 @@ msgstr ""
 "Bu e-mail adresi şifrenizi unutmanız halinde şifrenizi\n"
 "isterken kullanılacaktır."
 
-#: modules/commands/ns_register.cpp:135
-#, fuzzy
-msgid "You must specify an email address."
-msgstr "%s geçerli bir ban tipi değil."
-
 #: modules/commands/help.cpp:172
 msgid "You need to be identified to use this command."
 msgstr "You need to be identified to use this command."
@@ -11172,17 +11178,17 @@ msgstr ""
 msgid "Your account %s has been successfully created."
 msgstr "%s botu silindi."
 
-#: modules/commands/ns_register.cpp:300
+#: modules/commands/ns_register.cpp:297
 #, fuzzy
 msgid "Your account is already confirmed."
 msgstr "You are already identified."
 
-#: modules/commands/ns_register.cpp:368
+#: modules/commands/ns_register.cpp:365
 #, fuzzy, c-format
 msgid "Your account will expire, if not confirmed, in %s."
 msgstr "You are already identified."
 
-#: modules/commands/ns_set.cpp:1241
+#: modules/commands/ns_set.cpp:1247
 #, fuzzy, c-format
 msgid "Your email address has been changed to %s."
 msgstr "E-mail address for %s changed to %s."
@@ -11192,7 +11198,7 @@ msgstr "E-mail address for %s changed to %s."
 msgid "Your email address is not allowed, choose a different one."
 msgstr "%s serverındaki tüm O:line lar silindi."
 
-#: modules/commands/ns_register.cpp:363
+#: modules/commands/ns_register.cpp:360
 msgid ""
 "Your email address is not confirmed. To confirm it, follow the instructions "
 "that were emailed to you."
@@ -11249,12 +11255,12 @@ msgstr ""
 msgid "Your nick has been logged out."
 msgstr "Nickinizin çıkışı yapıldı."
 
-#: modules/commands/ns_group.cpp:131
+#: modules/commands/ns_group.cpp:147
 #, fuzzy
 msgid "Your nick is already registered."
 msgstr "Nickiniz zaten kayıtlı; önce /msg %s DROP yazın."
 
-#: modules/commands/ns_group.cpp:219
+#: modules/commands/ns_group.cpp:235
 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."
 
@@ -11263,7 +11269,7 @@ msgstr "Your nick is not grouped to anything, you can't ungroup it."
 msgid "Your nick isn't registered."
 msgstr "Nickname %s registered."
 
-#: modules/pseudoclients/nickserv.cpp:229
+#: modules/pseudoclients/nickserv.cpp:236
 #, c-format
 msgid "Your nickname is now being changed to %s"
 msgstr "Nickiniz %s olarak değiştirildi."
@@ -11272,12 +11278,12 @@ msgstr "Nickiniz %s olarak değiştirildi."
 msgid "Your oper block doesn't require logging in."
 msgstr ""
 
-#: modules/commands/ns_register.cpp:308
+#: modules/commands/ns_register.cpp:305
 #, c-format
 msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
-#: modules/commands/ns_register.cpp:216
+#: modules/commands/ns_register.cpp:210
 #, c-format
 msgid "Your password is %s - remember this for later use."
 msgstr ""
@@ -11288,7 +11294,7 @@ msgstr ""
 msgid "Your password is too long. Please try again with a shorter password."
 msgstr ""
 
-#: modules/commands/ns_resetpass.cpp:98
+#: modules/commands/ns_resetpass.cpp:96
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."
 
@@ -11408,7 +11414,7 @@ msgstr ""
 msgid "[nick | channel]"
 msgstr "CANCEL {nick | kanaladı}"
 
-#: modules/commands/ns_group.cpp:208
+#: modules/commands/ns_group.cpp:224
 #, fuzzy
 msgid "[nick]"
 msgstr "INFO nick"
@@ -11417,8 +11423,8 @@ msgstr "INFO nick"
 msgid "[nickname [REVALIDATE]]"
 msgstr ""
 
-#: modules/commands/ns_alist.cpp:25 modules/commands/ns_info.cpp:20
-#: modules/commands/ns_status.cpp:20
+#: modules/commands/ns_status.cpp:20 modules/commands/ns_alist.cpp:25
+#: modules/commands/ns_info.cpp:20
 #, fuzzy
 msgid "[nickname]"
 msgstr "CHECK nickname"
@@ -11440,7 +11446,7 @@ msgstr "CHANKILL [+expiry] {#channel} [reason]"
 msgid "[Hostname hidden]"
 msgstr ""
 
-#: modules/commands/cs_list.cpp:109 modules/commands/ns_list.cpp:112
+#: modules/commands/ns_list.cpp:112 modules/commands/cs_list.cpp:109
 msgid "[Suspended]"
 msgstr ""
 
@@ -11609,7 +11615,7 @@ msgstr "UNBAN kanaladı [name]"
 msgid "{nick | channel}"
 msgstr "CANCEL {nick | kanaladı}"
 
-#: modules/commands/ms_send.cpp:25 modules/commands/ms_rsend.cpp:25
+#: modules/commands/ms_rsend.cpp:25 modules/commands/ms_send.cpp:25
 #, fuzzy
 msgid "{nick | channel} memo-text"
 msgstr "SEND {nick | kanaladı} mesaj"
