Rewrote the example configurations and split them

up into seperate files for each pseudo client.

Also reorganized how the modules are stored, and
made most of the old "extra" modules "core"

184 files changed, 7 insertions, 1582 deletions

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 724899041..d4bd3f7a1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory("extra/language")
+add_subdirectory("third/language")
 
 # Get a list of ALL files and directories within the current directory
 file(GLOB MODULES_FOLDERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
@@ -96,7 +96,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
     # Get a list of ALL files and directories within this modules directory
     file(GLOB SUBMODULE_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${MODULE_FOLDER}/*")
     remove_item_from_list(SUBMODULE_DIRS "CMakeFiles")
-    remove_item_from_list(SUBMODULE_DIRS "extra/language")
+    remove_item_from_list(SUBMODULE_DIRS "third/language")
 
     foreach(SUBDIR ${SUBMODULE_DIRS})
       if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
diff --git a/modules/core/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 803368994..803368994 100644
--- a/modules/core/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
diff --git a/modules/core/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index a27dca2d4..a27dca2d4 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
diff --git a/modules/core/bs_bot.cpp b/modules/commands/bs_bot.cpp
index 7500d1926..7500d1926 100644
--- a/modules/core/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
diff --git a/modules/core/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index ee7e4d2d8..ee7e4d2d8 100644
--- a/modules/core/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
diff --git a/modules/core/bs_control.cpp b/modules/commands/bs_control.cpp
index 16a5b372a..16a5b372a 100644
--- a/modules/core/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
diff --git a/modules/core/bs_info.cpp b/modules/commands/bs_info.cpp
index b48a0b296..b48a0b296 100644
--- a/modules/core/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
diff --git a/modules/core/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 3f433f773..3f433f773 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
diff --git a/modules/core/bs_set.cpp b/modules/commands/bs_set.cpp
index ccd1bb615..ccd1bb615 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
diff --git a/modules/core/cs_access.cpp b/modules/commands/cs_access.cpp
index 777b0c176..777b0c176 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
diff --git a/modules/core/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 437bf5572..437bf5572 100644
--- a/modules/core/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
diff --git a/modules/extra/cs_appendtopic.cpp b/modules/commands/cs_appendtopic.cpp
index c9af50613..c9af50613 100644
--- a/modules/extra/cs_appendtopic.cpp
+++ b/modules/commands/cs_appendtopic.cpp
diff --git a/modules/core/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 759649662..759649662 100644
--- a/modules/core/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
diff --git a/modules/core/cs_clearusers.cpp b/modules/commands/cs_clearusers.cpp
index 18dc75479..18dc75479 100644
--- a/modules/core/cs_clearusers.cpp
+++ b/modules/commands/cs_clearusers.cpp
diff --git a/modules/core/cs_clone.cpp b/modules/commands/cs_clone.cpp
index 5ede6a9e4..5ede6a9e4 100644
--- a/modules/core/cs_clone.cpp
+++ b/modules/commands/cs_clone.cpp
diff --git a/modules/core/cs_drop.cpp b/modules/commands/cs_drop.cpp
index eb01875db..eb01875db 100644
--- a/modules/core/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
diff --git a/modules/extra/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index 26885c9b0..26885c9b0 100644
--- a/modules/extra/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
diff --git a/modules/extra/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index 3aa8ed862..3aa8ed862 100644
--- a/modules/extra/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
diff --git a/modules/core/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 48f1a22f1..48f1a22f1 100644
--- a/modules/core/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
diff --git a/modules/core/cs_getkey.cpp b/modules/commands/cs_getkey.cpp
index 4a6d62442..4a6d62442 100644
--- a/modules/core/cs_getkey.cpp
+++ b/modules/commands/cs_getkey.cpp
diff --git a/modules/core/cs_info.cpp b/modules/commands/cs_info.cpp
index ef026563e..ef026563e 100644
--- a/modules/core/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
diff --git a/modules/core/cs_invite.cpp b/modules/commands/cs_invite.cpp
index 27b4b03a3..27b4b03a3 100644
--- a/modules/core/cs_invite.cpp
+++ b/modules/commands/cs_invite.cpp
diff --git a/modules/core/cs_kick.cpp b/modules/commands/cs_kick.cpp
index b98d0953d..b98d0953d 100644
--- a/modules/core/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
diff --git a/modules/core/cs_list.cpp b/modules/commands/cs_list.cpp
index a79c047c4..a79c047c4 100644
--- a/modules/core/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
diff --git a/modules/core/cs_mode.cpp b/modules/commands/cs_mode.cpp
index e67abd85a..e67abd85a 100644
--- a/modules/core/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
diff --git a/modules/core/cs_modes.cpp b/modules/commands/cs_modes.cpp
index cee2f9460..cee2f9460 100644
--- a/modules/core/cs_modes.cpp
+++ b/modules/commands/cs_modes.cpp
diff --git a/modules/core/cs_register.cpp b/modules/commands/cs_register.cpp
index 117212519..117212519 100644
--- a/modules/core/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
diff --git a/modules/core/cs_saset.cpp b/modules/commands/cs_saset.cpp
index 699c5bc2c..699c5bc2c 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/commands/cs_saset.cpp
diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/commands/cs_saset_noexpire.cpp
index 1e085496f..1e085496f 100644
--- a/modules/core/cs_saset_noexpire.cpp
+++ b/modules/commands/cs_saset_noexpire.cpp
diff --git a/modules/core/cs_set.cpp b/modules/commands/cs_set.cpp
index 65719ce91..65719ce91 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
diff --git a/modules/core/cs_set_bantype.cpp b/modules/commands/cs_set_bantype.cpp
index 94d2aa151..94d2aa151 100644
--- a/modules/core/cs_set_bantype.cpp
+++ b/modules/commands/cs_set_bantype.cpp
diff --git a/modules/core/cs_set_description.cpp b/modules/commands/cs_set_description.cpp
index 5c2cd447d..5c2cd447d 100644
--- a/modules/core/cs_set_description.cpp
+++ b/modules/commands/cs_set_description.cpp
diff --git a/modules/core/cs_set_founder.cpp b/modules/commands/cs_set_founder.cpp
index 2169af972..2169af972 100644
--- a/modules/core/cs_set_founder.cpp
+++ b/modules/commands/cs_set_founder.cpp
diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/commands/cs_set_keeptopic.cpp
index 05578a2e5..05578a2e5 100644
--- a/modules/core/cs_set_keeptopic.cpp
+++ b/modules/commands/cs_set_keeptopic.cpp
diff --git a/modules/extra/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp
index 8f145ab88..8f145ab88 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/commands/cs_set_misc.cpp
diff --git a/modules/core/cs_set_opnotice.cpp b/modules/commands/cs_set_opnotice.cpp
index 018b89437..018b89437 100644
--- a/modules/core/cs_set_opnotice.cpp
+++ b/modules/commands/cs_set_opnotice.cpp
diff --git a/modules/core/cs_set_peace.cpp b/modules/commands/cs_set_peace.cpp
index 3a045fc6d..3a045fc6d 100644
--- a/modules/core/cs_set_peace.cpp
+++ b/modules/commands/cs_set_peace.cpp
diff --git a/modules/core/cs_set_persist.cpp b/modules/commands/cs_set_persist.cpp
index 3cc9564c4..3cc9564c4 100644
--- a/modules/core/cs_set_persist.cpp
+++ b/modules/commands/cs_set_persist.cpp
diff --git a/modules/core/cs_set_private.cpp b/modules/commands/cs_set_private.cpp
index 108b11569..108b11569 100644
--- a/modules/core/cs_set_private.cpp
+++ b/modules/commands/cs_set_private.cpp
diff --git a/modules/core/cs_set_restricted.cpp b/modules/commands/cs_set_restricted.cpp
index 5d675d2e7..5d675d2e7 100644
--- a/modules/core/cs_set_restricted.cpp
+++ b/modules/commands/cs_set_restricted.cpp
diff --git a/modules/core/cs_set_secure.cpp b/modules/commands/cs_set_secure.cpp
index 26e8c5768..26e8c5768 100644
--- a/modules/core/cs_set_secure.cpp
+++ b/modules/commands/cs_set_secure.cpp
diff --git a/modules/core/cs_set_securefounder.cpp b/modules/commands/cs_set_securefounder.cpp
index 7afc2e32d..7afc2e32d 100644
--- a/modules/core/cs_set_securefounder.cpp
+++ b/modules/commands/cs_set_securefounder.cpp
diff --git a/modules/core/cs_set_secureops.cpp b/modules/commands/cs_set_secureops.cpp
index 4c3c54b05..4c3c54b05 100644
--- a/modules/core/cs_set_secureops.cpp
+++ b/modules/commands/cs_set_secureops.cpp
diff --git a/modules/core/cs_set_signkick.cpp b/modules/commands/cs_set_signkick.cpp
index 0d421576d..0d421576d 100644
--- a/modules/core/cs_set_signkick.cpp
+++ b/modules/commands/cs_set_signkick.cpp
diff --git a/modules/core/cs_set_successor.cpp b/modules/commands/cs_set_successor.cpp
index f7ed8dba9..f7ed8dba9 100644
--- a/modules/core/cs_set_successor.cpp
+++ b/modules/commands/cs_set_successor.cpp
diff --git a/modules/core/cs_set_topiclock.cpp b/modules/commands/cs_set_topiclock.cpp
index e670385ba..e670385ba 100644
--- a/modules/core/cs_set_topiclock.cpp
+++ b/modules/commands/cs_set_topiclock.cpp
diff --git a/modules/core/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index d59ffb44b..d59ffb44b 100644
--- a/modules/core/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
diff --git a/modules/extra/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 2937cc4fc..2937cc4fc 100644
--- a/modules/extra/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
diff --git a/modules/extra/cs_tban.cpp b/modules/commands/cs_tban.cpp
index 404279bef..404279bef 100644
--- a/modules/extra/cs_tban.cpp
+++ b/modules/commands/cs_tban.cpp
diff --git a/modules/core/cs_topic.cpp b/modules/commands/cs_topic.cpp
index 1b5de11c3..1b5de11c3 100644
--- a/modules/core/cs_topic.cpp
+++ b/modules/commands/cs_topic.cpp
diff --git a/modules/core/cs_unban.cpp b/modules/commands/cs_unban.cpp
index cc3c68e91..cc3c68e91 100644
--- a/modules/core/cs_unban.cpp
+++ b/modules/commands/cs_unban.cpp
diff --git a/modules/core/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 1b9348026..1b9348026 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
diff --git a/modules/core/gl_global.cpp b/modules/commands/gl_global.cpp
index 80c42e017..80c42e017 100644
--- a/modules/core/gl_global.cpp
+++ b/modules/commands/gl_global.cpp
diff --git a/modules/core/help.cpp b/modules/commands/help.cpp
index 2a4f25b6c..2a4f25b6c 100644
--- a/modules/core/help.cpp
+++ b/modules/commands/help.cpp
diff --git a/modules/core/hs_del.cpp b/modules/commands/hs_del.cpp
index 541986aff..541986aff 100644
--- a/modules/core/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
diff --git a/modules/core/hs_group.cpp b/modules/commands/hs_group.cpp
index 8d6fbd630..8d6fbd630 100644
--- a/modules/core/hs_group.cpp
+++ b/modules/commands/hs_group.cpp
diff --git a/modules/core/hs_list.cpp b/modules/commands/hs_list.cpp
index 589eef3e1..589eef3e1 100644
--- a/modules/core/hs_list.cpp
+++ b/modules/commands/hs_list.cpp
diff --git a/modules/core/hs_off.cpp b/modules/commands/hs_off.cpp
index a3f11c2bd..a3f11c2bd 100644
--- a/modules/core/hs_off.cpp
+++ b/modules/commands/hs_off.cpp
diff --git a/modules/core/hs_on.cpp b/modules/commands/hs_on.cpp
index 0ba124ba1..0ba124ba1 100644
--- a/modules/core/hs_on.cpp
+++ b/modules/commands/hs_on.cpp
diff --git a/modules/extra/hs_request.cpp b/modules/commands/hs_request.cpp
index 7686794f5..7686794f5 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
diff --git a/modules/core/hs_set.cpp b/modules/commands/hs_set.cpp
index 4711022db..4711022db 100644
--- a/modules/core/hs_set.cpp
+++ b/modules/commands/hs_set.cpp
diff --git a/modules/core/ms_cancel.cpp b/modules/commands/ms_cancel.cpp
index e5beffa10..e5beffa10 100644
--- a/modules/core/ms_cancel.cpp
+++ b/modules/commands/ms_cancel.cpp
diff --git a/modules/core/ms_check.cpp b/modules/commands/ms_check.cpp
index 3019e270f..3019e270f 100644
--- a/modules/core/ms_check.cpp
+++ b/modules/commands/ms_check.cpp
diff --git a/modules/core/ms_del.cpp b/modules/commands/ms_del.cpp
index 991adff2b..991adff2b 100644
--- a/modules/core/ms_del.cpp
+++ b/modules/commands/ms_del.cpp
diff --git a/modules/core/ms_ignore.cpp b/modules/commands/ms_ignore.cpp
index c8b9c19e6..c8b9c19e6 100644
--- a/modules/core/ms_ignore.cpp
+++ b/modules/commands/ms_ignore.cpp
diff --git a/modules/core/ms_info.cpp b/modules/commands/ms_info.cpp
index 9fdb467c9..9fdb467c9 100644
--- a/modules/core/ms_info.cpp
+++ b/modules/commands/ms_info.cpp
diff --git a/modules/core/ms_list.cpp b/modules/commands/ms_list.cpp
index 26821a413..26821a413 100644
--- a/modules/core/ms_list.cpp
+++ b/modules/commands/ms_list.cpp
diff --git a/modules/core/ms_read.cpp b/modules/commands/ms_read.cpp
index f275f8d7d..f275f8d7d 100644
--- a/modules/core/ms_read.cpp
+++ b/modules/commands/ms_read.cpp
diff --git a/modules/core/ms_rsend.cpp b/modules/commands/ms_rsend.cpp
index 37c633e02..37c633e02 100644
--- a/modules/core/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
diff --git a/modules/core/ms_send.cpp b/modules/commands/ms_send.cpp
index 9397e7ad7..9397e7ad7 100644
--- a/modules/core/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
diff --git a/modules/core/ms_sendall.cpp b/modules/commands/ms_sendall.cpp
index 7af5ac7af..7af5ac7af 100644
--- a/modules/core/ms_sendall.cpp
+++ b/modules/commands/ms_sendall.cpp
diff --git a/modules/core/ms_set.cpp b/modules/commands/ms_set.cpp
index 1aa3f469d..1aa3f469d 100644
--- a/modules/core/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
diff --git a/modules/core/ms_staff.cpp b/modules/commands/ms_staff.cpp
index 6264dbea4..6264dbea4 100644
--- a/modules/core/ms_staff.cpp
+++ b/modules/commands/ms_staff.cpp
diff --git a/modules/core/ns_access.cpp b/modules/commands/ns_access.cpp
index df9ae6eed..df9ae6eed 100644
--- a/modules/core/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
diff --git a/modules/core/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index 4f35f28b8..4f35f28b8 100644
--- a/modules/core/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
diff --git a/modules/core/ns_alist.cpp b/modules/commands/ns_alist.cpp
index f502b4344..f502b4344 100644
--- a/modules/core/ns_alist.cpp
+++ b/modules/commands/ns_alist.cpp
diff --git a/modules/core/ns_cert.cpp b/modules/commands/ns_cert.cpp
index fbd75d597..fbd75d597 100644
--- a/modules/core/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
diff --git a/modules/core/ns_drop.cpp b/modules/commands/ns_drop.cpp
index 7960652ff..7960652ff 100644
--- a/modules/core/ns_drop.cpp
+++ b/modules/commands/ns_drop.cpp
diff --git a/modules/core/ns_getemail.cpp b/modules/commands/ns_getemail.cpp
index fa27e5174..fa27e5174 100644
--- a/modules/core/ns_getemail.cpp
+++ b/modules/commands/ns_getemail.cpp
diff --git a/modules/core/ns_getpass.cpp b/modules/commands/ns_getpass.cpp
index 9ebea5263..9ebea5263 100644
--- a/modules/core/ns_getpass.cpp
+++ b/modules/commands/ns_getpass.cpp
diff --git a/modules/core/ns_ghost.cpp b/modules/commands/ns_ghost.cpp
index 37dcef9c7..37dcef9c7 100644
--- a/modules/core/ns_ghost.cpp
+++ b/modules/commands/ns_ghost.cpp
diff --git a/modules/core/ns_group.cpp b/modules/commands/ns_group.cpp
index 2e23e1f51..2e23e1f51 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
diff --git a/modules/core/ns_identify.cpp b/modules/commands/ns_identify.cpp
index b0a375cd2..b0a375cd2 100644
--- a/modules/core/ns_identify.cpp
+++ b/modules/commands/ns_identify.cpp
diff --git a/modules/core/ns_info.cpp b/modules/commands/ns_info.cpp
index 5a6d9dc0c..5a6d9dc0c 100644
--- a/modules/core/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
diff --git a/modules/core/ns_list.cpp b/modules/commands/ns_list.cpp
index 96049ba02..96049ba02 100644
--- a/modules/core/ns_list.cpp
+++ b/modules/commands/ns_list.cpp
diff --git a/modules/core/ns_logout.cpp b/modules/commands/ns_logout.cpp
index 476330a11..476330a11 100644
--- a/modules/core/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
diff --git a/modules/core/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 5e45aab9a..5e45aab9a 100644
--- a/modules/core/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
diff --git a/modules/core/ns_register.cpp b/modules/commands/ns_register.cpp
index 552551994..552551994 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
diff --git a/modules/core/ns_release.cpp b/modules/commands/ns_release.cpp
index 20a3e295c..20a3e295c 100644
--- a/modules/core/ns_release.cpp
+++ b/modules/commands/ns_release.cpp
diff --git a/modules/core/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp
index b0d40226f..b0d40226f 100644
--- a/modules/core/ns_resetpass.cpp
+++ b/modules/commands/ns_resetpass.cpp
diff --git a/modules/core/ns_saset.cpp b/modules/commands/ns_saset.cpp
index a4aa2f422..a4aa2f422 100644
--- a/modules/core/ns_saset.cpp
+++ b/modules/commands/ns_saset.cpp
diff --git a/modules/core/ns_saset_noexpire.cpp b/modules/commands/ns_saset_noexpire.cpp
index 1bff9b461..1bff9b461 100644
--- a/modules/core/ns_saset_noexpire.cpp
+++ b/modules/commands/ns_saset_noexpire.cpp
diff --git a/modules/core/ns_sendpass.cpp b/modules/commands/ns_sendpass.cpp
index ca185c68b..ca185c68b 100644
--- a/modules/core/ns_sendpass.cpp
+++ b/modules/commands/ns_sendpass.cpp
diff --git a/modules/core/ns_set.cpp b/modules/commands/ns_set.cpp
index ad7acb5a4..ad7acb5a4 100644
--- a/modules/core/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
diff --git a/modules/core/ns_set_autoop.cpp b/modules/commands/ns_set_autoop.cpp
index ff178141f..ff178141f 100644
--- a/modules/core/ns_set_autoop.cpp
+++ b/modules/commands/ns_set_autoop.cpp
diff --git a/modules/core/ns_set_email.cpp b/modules/commands/ns_set_email.cpp
index f0914eb51..f0914eb51 100644
--- a/modules/core/ns_set_email.cpp
+++ b/modules/commands/ns_set_email.cpp
diff --git a/modules/core/ns_set_greet.cpp b/modules/commands/ns_set_greet.cpp
index 03bcd3834..03bcd3834 100644
--- a/modules/core/ns_set_greet.cpp
+++ b/modules/commands/ns_set_greet.cpp
diff --git a/modules/core/ns_set_hide.cpp b/modules/commands/ns_set_hide.cpp
index e0fb0e85e..e0fb0e85e 100644
--- a/modules/core/ns_set_hide.cpp
+++ b/modules/commands/ns_set_hide.cpp
diff --git a/modules/core/ns_set_kill.cpp b/modules/commands/ns_set_kill.cpp
index f57a93893..f57a93893 100644
--- a/modules/core/ns_set_kill.cpp
+++ b/modules/commands/ns_set_kill.cpp
diff --git a/modules/core/ns_set_language.cpp b/modules/commands/ns_set_language.cpp
index 3429ad688..3429ad688 100644
--- a/modules/core/ns_set_language.cpp
+++ b/modules/commands/ns_set_language.cpp
diff --git a/modules/core/ns_set_message.cpp b/modules/commands/ns_set_message.cpp
index 677002c78..677002c78 100644
--- a/modules/core/ns_set_message.cpp
+++ b/modules/commands/ns_set_message.cpp
diff --git a/modules/extra/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index f0ee269cc..f0ee269cc 100644
--- a/modules/extra/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
diff --git a/modules/core/ns_set_private.cpp b/modules/commands/ns_set_private.cpp
index 63fec57d6..63fec57d6 100644
--- a/modules/core/ns_set_private.cpp
+++ b/modules/commands/ns_set_private.cpp
diff --git a/modules/core/ns_set_secure.cpp b/modules/commands/ns_set_secure.cpp
index 31314a5a5..31314a5a5 100644
--- a/modules/core/ns_set_secure.cpp
+++ b/modules/commands/ns_set_secure.cpp
diff --git a/modules/core/ns_status.cpp b/modules/commands/ns_status.cpp
index 9d8b58fcb..9d8b58fcb 100644
--- a/modules/core/ns_status.cpp
+++ b/modules/commands/ns_status.cpp
diff --git a/modules/core/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index 50cf039ce..50cf039ce 100644
--- a/modules/core/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
diff --git a/modules/core/ns_update.cpp b/modules/commands/ns_update.cpp
index d870e3532..d870e3532 100644
--- a/modules/core/ns_update.cpp
+++ b/modules/commands/ns_update.cpp
diff --git a/modules/core/os_akill.cpp b/modules/commands/os_akill.cpp
index 05602a746..05602a746 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/commands/os_akill.cpp
diff --git a/modules/core/os_chankill.cpp b/modules/commands/os_chankill.cpp
index 9ce895c59..9ce895c59 100644
--- a/modules/core/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
diff --git a/modules/core/os_config.cpp b/modules/commands/os_config.cpp
index 1d1fead33..1d1fead33 100644
--- a/modules/core/os_config.cpp
+++ b/modules/commands/os_config.cpp
diff --git a/modules/extra/os_defcon.cpp b/modules/commands/os_defcon.cpp
index ea513e1dc..ea513e1dc 100644
--- a/modules/extra/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
diff --git a/modules/core/os_forbid.cpp b/modules/commands/os_forbid.cpp
index d4b4c2b41..d4b4c2b41 100644
--- a/modules/core/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
diff --git a/modules/core/os_forbid.h b/modules/commands/os_forbid.h
index b91aa3be8..b91aa3be8 100644
--- a/modules/core/os_forbid.h
+++ b/modules/commands/os_forbid.h
diff --git a/modules/core/os_ignore.cpp b/modules/commands/os_ignore.cpp
index 9f50ec967..9f50ec967 100644
--- a/modules/core/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
diff --git a/modules/core/os_ignore.h b/modules/commands/os_ignore.h
index 056161a79..056161a79 100644
--- a/modules/core/os_ignore.h
+++ b/modules/commands/os_ignore.h
diff --git a/modules/core/os_jupe.cpp b/modules/commands/os_jupe.cpp
index a689b33e2..a689b33e2 100644
--- a/modules/core/os_jupe.cpp
+++ b/modules/commands/os_jupe.cpp
diff --git a/modules/core/os_kick.cpp b/modules/commands/os_kick.cpp
index 341ea1ee6..341ea1ee6 100644
--- a/modules/core/os_kick.cpp
+++ b/modules/commands/os_kick.cpp
diff --git a/modules/core/os_kill.cpp b/modules/commands/os_kill.cpp
index 11a0636ef..11a0636ef 100644
--- a/modules/core/os_kill.cpp
+++ b/modules/commands/os_kill.cpp
diff --git a/modules/core/os_list.cpp b/modules/commands/os_list.cpp
index 9a582f97b..9a582f97b 100644
--- a/modules/core/os_list.cpp
+++ b/modules/commands/os_list.cpp
diff --git a/modules/core/os_login.cpp b/modules/commands/os_login.cpp
index 94a82e334..94a82e334 100644
--- a/modules/core/os_login.cpp
+++ b/modules/commands/os_login.cpp
diff --git a/modules/core/os_mode.cpp b/modules/commands/os_mode.cpp
index b3e62ca25..b3e62ca25 100644
--- a/modules/core/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
diff --git a/modules/core/os_modinfo.cpp b/modules/commands/os_modinfo.cpp
index 38d9cf905..38d9cf905 100644
--- a/modules/core/os_modinfo.cpp
+++ b/modules/commands/os_modinfo.cpp
diff --git a/modules/core/os_module.cpp b/modules/commands/os_module.cpp
index 562e130aa..562e130aa 100644
--- a/modules/core/os_module.cpp
+++ b/modules/commands/os_module.cpp
diff --git a/modules/core/os_news.cpp b/modules/commands/os_news.cpp
index 9c9aae0a4..9c9aae0a4 100644
--- a/modules/core/os_news.cpp
+++ b/modules/commands/os_news.cpp
diff --git a/modules/core/os_news.h b/modules/commands/os_news.h
index c55f56d42..c55f56d42 100644
--- a/modules/core/os_news.h
+++ b/modules/commands/os_news.h
diff --git a/modules/core/os_noop.cpp b/modules/commands/os_noop.cpp
index 2eec522a3..2eec522a3 100644
--- a/modules/core/os_noop.cpp
+++ b/modules/commands/os_noop.cpp
diff --git a/modules/core/os_oline.cpp b/modules/commands/os_oline.cpp
index adebc52a1..adebc52a1 100644
--- a/modules/core/os_oline.cpp
+++ b/modules/commands/os_oline.cpp
diff --git a/modules/core/os_oper.cpp b/modules/commands/os_oper.cpp
index 237c0b5bc..237c0b5bc 100644
--- a/modules/core/os_oper.cpp
+++ b/modules/commands/os_oper.cpp
diff --git a/modules/core/os_reload.cpp b/modules/commands/os_reload.cpp
index d4d8eac7c..d4d8eac7c 100644
--- a/modules/core/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
diff --git a/modules/core/os_session.cpp b/modules/commands/os_session.cpp
index 990cd1b4b..990cd1b4b 100644
--- a/modules/core/os_session.cpp
+++ b/modules/commands/os_session.cpp
diff --git a/modules/core/os_session.h b/modules/commands/os_session.h
index faab37934..faab37934 100644
--- a/modules/core/os_session.h
+++ b/modules/commands/os_session.h
diff --git a/modules/core/os_set.cpp b/modules/commands/os_set.cpp
index 2a50f851c..2a50f851c 100644
--- a/modules/core/os_set.cpp
+++ b/modules/commands/os_set.cpp
diff --git a/modules/core/os_shutdown.cpp b/modules/commands/os_shutdown.cpp
index bc3a19353..bc3a19353 100644
--- a/modules/core/os_shutdown.cpp
+++ b/modules/commands/os_shutdown.cpp
diff --git a/modules/core/os_stats.cpp b/modules/commands/os_stats.cpp
index 2c20395d0..2c20395d0 100644
--- a/modules/core/os_stats.cpp
+++ b/modules/commands/os_stats.cpp
diff --git a/modules/core/os_svsnick.cpp b/modules/commands/os_svsnick.cpp
index dc7c77a6c..dc7c77a6c 100644
--- a/modules/core/os_svsnick.cpp
+++ b/modules/commands/os_svsnick.cpp
diff --git a/modules/core/os_sxline.cpp b/modules/commands/os_sxline.cpp
index f949cb7d2..f949cb7d2 100644
--- a/modules/core/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
diff --git a/modules/core/os_update.cpp b/modules/commands/os_update.cpp
index 776835cf7..776835cf7 100644
--- a/modules/core/os_update.cpp
+++ b/modules/commands/os_update.cpp
diff --git a/modules/core/db_mysql.cpp b/modules/database/db_mysql.cpp
index 4e6a7de4f..59ab412b3 100644
--- a/modules/core/db_mysql.cpp
+++ b/modules/database/db_mysql.cpp
@@ -1,6 +1,6 @@
 #include "module.h"
 #include "../extra/sql.h"
-#include "os_session.h"
+#include "../commands/os_session.h"
 
 static Anope::string ToString(const std::vector<Anope::string> &strings)
 {
diff --git a/modules/core/db_mysql_live.cpp b/modules/database/db_mysql_live.cpp
index ecfdc70d1..ecfdc70d1 100644
--- a/modules/core/db_mysql_live.cpp
+++ b/modules/database/db_mysql_live.cpp
diff --git a/modules/core/db_plain.cpp b/modules/database/db_plain.cpp
index c41cea2d2..e2ade7974 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -11,7 +11,7 @@
 /*************************************************************************/
 
 #include "module.h"
-#include "os_session.h"
+#include "../commands/os_session.h"
 
 Anope::string DatabaseFile;
 std::stringstream db_buffer;
diff --git a/modules/core/enc_md5.cpp b/modules/encryption/enc_md5.cpp
index 109f31dfc..109f31dfc 100644
--- a/modules/core/enc_md5.cpp
+++ b/modules/encryption/enc_md5.cpp
diff --git a/modules/core/enc_none.cpp b/modules/encryption/enc_none.cpp
index 180b431c2..180b431c2 100644
--- a/modules/core/enc_none.cpp
+++ b/modules/encryption/enc_none.cpp
diff --git a/modules/core/enc_old.cpp b/modules/encryption/enc_old.cpp
index e68887c49..e68887c49 100644
--- a/modules/core/enc_old.cpp
+++ b/modules/encryption/enc_old.cpp
diff --git a/modules/core/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp
index 4fe321bdc..4fe321bdc 100644
--- a/modules/core/enc_sha1.cpp
+++ b/modules/encryption/enc_sha1.cpp
diff --git a/modules/core/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index 3034f3731..3034f3731 100644
--- a/modules/core/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
diff --git a/modules/extra/language/cs_appendtopic.de_DE.po b/modules/extra/language/cs_appendtopic.de_DE.po
deleted file mode 100644
index 2305709c1..000000000
--- a/modules/extra/language/cs_appendtopic.de_DE.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# German translations for cs_appendtopic
-# German messages for cs_appendtopic
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 20:57-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: German\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_appendtopic.cpp:50
-msgid "Add text to a channels topic"
-msgstr "Fьgt einen Text zu einem Channel-Topic hinzu."
-
-#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
-msgid "Syntax: APPENDTOPIC channel text"
-msgstr "Syntax: APPENDTOPIC Channel Text"
-
-#: ../cs_appendtopic.cpp:92
-msgid ""
-"This command allows users to append text to a currently set\n"
-"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-"the new, updated topic is locked."
-msgstr ""
-"Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-"
-"Topic\n"
-"hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n"
-"und das neue, aktualisierte Topic wird gesperrt."
diff --git a/modules/extra/language/cs_appendtopic.it_IT.po b/modules/extra/language/cs_appendtopic.it_IT.po
deleted file mode 100644
index 43620d0b2..000000000
--- a/modules/extra/language/cs_appendtopic.it_IT.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Italian translations for cs_appendtopic
-# Traduzioni italiane per il cs_appendtopic
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:04-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Italian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_appendtopic.cpp:50
-#, fuzzy
-msgid "Add text to a channels topic"
-msgstr "   APPENDTOPIC Aggiunge del testo al topic di un canale"
-
-#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
-msgid "Syntax: APPENDTOPIC channel text"
-msgstr "Sintassi: APPENDTOPIC canale testo"
-
-#: ../cs_appendtopic.cpp:92
-msgid ""
-"This command allows users to append text to a currently set\n"
-"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-"the new, updated topic is locked."
-msgstr ""
-"Questo comando permette agli utenti di aggiungere del testo ad un topic di "
-"un canale\n"
-"giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo "
-"topic\n"
-"viene bloccato."
diff --git a/modules/extra/language/cs_appendtopic.nl_NL.po b/modules/extra/language/cs_appendtopic.nl_NL.po
deleted file mode 100644
index 21d81eaba..000000000
--- a/modules/extra/language/cs_appendtopic.nl_NL.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Dutch translations for cs_appendtopic
-# Engelse vertalingen voor het cs_appendtopic
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 20:55-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Dutch\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_appendtopic.cpp:50
-#, fuzzy
-msgid "Add text to a channels topic"
-msgstr "   APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe"
-
-#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
-msgid "Syntax: APPENDTOPIC channel text"
-msgstr "Gebruik: APPENDTOPIC kanaal tekst"
-
-#: ../cs_appendtopic.cpp:92
-msgid ""
-"This command allows users to append text to a currently set\n"
-"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-"the new, updated topic is locked."
-msgstr ""
-"Dit command stelt gebruikers in staat om text toe te voegen\n"
-"achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n"
-"staat, zal het onderwerp worden bijgewerkt en zal het nieuwe,\n"
-"bijgewerkte topic worden geforceerd."
diff --git a/modules/extra/language/cs_appendtopic.pt_PT.po b/modules/extra/language/cs_appendtopic.pt_PT.po
deleted file mode 100644
index e97d94a90..000000000
--- a/modules/extra/language/cs_appendtopic.pt_PT.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Portuguese translations for cs_appendtopic
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:00-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Portuguese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_appendtopic.cpp:50
-#, fuzzy
-msgid "Add text to a channels topic"
-msgstr "   APPENDTOPIC Adiciona texto ao tуpico de um canal"
-
-#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
-msgid "Syntax: APPENDTOPIC channel text"
-msgstr "Sintaxe: APPENDTOPIC canal texto"
-
-#: ../cs_appendtopic.cpp:92
-msgid ""
-"This command allows users to append text to a currently set\n"
-"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-"the new, updated topic is locked."
-msgstr ""
-"Este comando permite aos usuбrios anexar texto a um tуpico de canal\n"
-"jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n"
-"o novo tуpico й travado."
diff --git a/modules/extra/language/cs_appendtopic.ru_RU.po b/modules/extra/language/cs_appendtopic.ru_RU.po
deleted file mode 100644
index cb5566a8c..000000000
--- a/modules/extra/language/cs_appendtopic.ru_RU.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Russian translations for cs_appendtopic
-# ?????????? ???????? ??? ?????? cs_appendtopic
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:02-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../cs_appendtopic.cpp:50
-#, fuzzy
-msgid "Add text to a channels topic"
-msgstr "   APPENDTOPIC Добавляет текст к топику канала"
-
-#: ../cs_appendtopic.cpp:90 ../cs_appendtopic.cpp:101
-msgid "Syntax: APPENDTOPIC channel text"
-msgstr "Синтаксис: APPENDTOPIC #канал текст"
-
-#: ../cs_appendtopic.cpp:92
-msgid ""
-"This command allows users to append text to a currently set\n"
-"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-"the new, updated topic is locked."
-msgstr ""
-"Данная команда позволяет добавить текст к топику, который установлен на "
-"указанном\n"
-"канале. Если активирован режим TOPICLOCK, топик будет обновлен и "
-"заблокирован.\n"
-"Примечание: текст будет ДОБАВЛЕН к топику, то есть старый топик удален НЕ "
-"БУДЕТ."
diff --git a/modules/extra/language/cs_enforce.de_DE.po b/modules/extra/language/cs_enforce.de_DE.po
deleted file mode 100644
index 5e8ccd94b..000000000
--- a/modules/extra/language/cs_enforce.de_DE.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# German translations for cs_enforce
-# German messages for cs_enforce
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:12-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: German\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_enforce.cpp:127
-#, fuzzy
-msgid "Enforce various channel modes and set options"
-msgstr "    ENFORCE    Erzwingt verschieden Modes und SET Optionen"
-
-#: ../cs_enforce.cpp:180
-msgid ""
-"Enforce various channel modes and set options. The channel\n"
-"option indicates what channel to enforce the modes and options\n"
-"on. The what option indicates what modes and options to\n"
-"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-"or +R. When left out, it defaults to SET.\n"
-" \n"
-"If what is SET, it will enforce SECUREOPS and RESTRICTED\n"
-"on the users currently in the channel, if they are set. Give\n"
-"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-"if it's not enabled."
-msgstr ""
-"Erzwingt verschieden Modes und SET Optionen. Die Channel\n"
-"Option zeigt dir den Channel an, indem Modes und Optionen\n"
-"zu erzwingen sind. Die was Option zeigt dir welche Modes\n"
-"und Optionen zu erzwingen sind. Die kцnnen nur SET, SECUREOPS,\n"
-"RESTRICTED, MODES oder +R sein.Default ist SET.\n"
-" \n"
-"Wenn was SET ist, wird SECUREOPS und RESTRICTED\n"
-"auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n"
-"Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n"
-"zu erzwingen, also wenn sie nicht eingeschaltet sind."
-
-#: ../cs_enforce.cpp:147 ../cs_enforce.cpp:152 ../cs_enforce.cpp:157
-#: ../cs_enforce.cpp:162 ../cs_enforce.cpp:167
-#, c-format
-msgid "Enforced %s"
-msgstr "Erzwungen %s"
-
-#: ../cs_enforce.cpp:193
-msgid ""
-"If what is MODES, it will enforce channelmode +R if it is\n"
-"set. If +R is specified for what, the +R channelmode will\n"
-"also be enforced, but even if it is not set. If it is not set,\n"
-"users will be banned to ensure they don't just rejoin."
-msgstr ""
-"Wenn was MODES ist, wird das ChannelMode +R erzwungen\n"
-"falls an. Wenn was +R ist, wird +R erzwungen aber eben\n"
-"wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n"
-"Channel-Mode war werden alle User aus den Channel gebannt um\n"
-"sicher zu sein das sie nicht rejoinen."
-
-#: ../cs_enforce.cpp:198
-msgid ""
-"If what is MODES, nothing will be enforced, since it would\n"
-"enforce modes that the current ircd does not support. If +R is\n"
-"specified for what, an equalivant of channelmode +R on\n"
-"other ircds will be enforced. All users that are in the channel\n"
-"but have not identified for their nickname will be kicked and\n"
-"banned from the channel."
-msgstr ""
-"Wenn was MODES ist, wird nichts erzwungen weil es MODES seine\n"
-"kцnnen die dein IRCD nicht unterstьtzt. Wenn was +R ist\n"
-"oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n"
-"erzwungen. Alle User die nicht fьr deren Nicknamen identifiziert\n"
-"sind werden aus den Channel gekickt und gebannt."
-
-#: ../cs_enforce.cpp:178 ../cs_enforce.cpp:210
-msgid "Syntax: ENFORCE channel [what]"
-msgstr "Syntax: ENFORCE Channel [was]"
diff --git a/modules/extra/language/cs_enforce.it_IT.po b/modules/extra/language/cs_enforce.it_IT.po
deleted file mode 100644
index 4721e823f..000000000
--- a/modules/extra/language/cs_enforce.it_IT.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Italian translations for cs_enforce
-# Traduzioni italiane per il cs_enforce
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:55-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Italian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_enforce.cpp:127
-#, fuzzy
-msgid "Enforce various channel modes and set options"
-msgstr "    ENFORCE    Forza diversi modi di canale ed opzioni SET"
-
-#: ../cs_enforce.cpp:180
-msgid ""
-"Enforce various channel modes and set options. The channel\n"
-"option indicates what channel to enforce the modes and options\n"
-"on. The what option indicates what modes and options to\n"
-"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-"or +R. When left out, it defaults to SET.\n"
-" \n"
-"If what is SET, it will enforce SECUREOPS and RESTRICTED\n"
-"on the users currently in the channel, if they are set. Give\n"
-"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-"if it's not enabled."
-msgstr ""
-"Forza diversi modi di canale ed opzioni SET. Il parametro canale\n"
-"indica il canale sul quale forzare i modi e le opzioni. Il parametro\n"
-"cosa indica i modi e le opzioni da forzare, e possono essere\n"
-"qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n"
-"Se non specificato, viene sottointeso SET.\n"
-" \n"
-"Se cosa и SET, forzerа SECUREOPS e RESTRICTED sugli utenti\n"
-"attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n"
-"forzare l'opzione SECUREOPS, anche se non и attivata. Specifica\n"
-"RESTRICTED per forzare l'opzione RESTRICTED, anche se non и\n"
-"attivata."
-
-#: ../cs_enforce.cpp:147 ../cs_enforce.cpp:152 ../cs_enforce.cpp:157
-#: ../cs_enforce.cpp:162 ../cs_enforce.cpp:167
-#, c-format
-msgid "Enforced %s"
-msgstr "Forzato %s"
-
-#: ../cs_enforce.cpp:193
-msgid ""
-"If what is MODES, it will enforce channelmode +R if it is\n"
-"set. If +R is specified for what, the +R channelmode will\n"
-"also be enforced, but even if it is not set. If it is not set,\n"
-"users will be banned to ensure they don't just rejoin."
-msgstr ""
-"Se cosa и MODES, forzerа il modo del canale +R se и impostato.\n"
-"Se +R и specificato per cosa, il modo del canale +R verrа\n"
-"forzato, anche se non и impostato. Se non и impostato, gli utenti\n"
-"verranno bannati per assicurare che non rientrino semplicemente."
-
-#: ../cs_enforce.cpp:198
-msgid ""
-"If what is MODES, nothing will be enforced, since it would\n"
-"enforce modes that the current ircd does not support. If +R is\n"
-"specified for what, an equalivant of channelmode +R on\n"
-"other ircds will be enforced. All users that are in the channel\n"
-"but have not identified for their nickname will be kicked and\n"
-"banned from the channel."
-msgstr ""
-"Se cosa и MODES, niente verrа forzato, siccome forzerebbe\n"
-"dei modi che l'ircd in uso non supporterebbe. Se +R и specificato\n"
-"per cosa, un modo equivalente a +R sui altri ircd verrа\n"
-"forzato. Tutti gli utenti presenti nel canale ma non identificati\n"
-"per il loro nickname verranno bannati ed espulsi dal canale."
-
-#: ../cs_enforce.cpp:178 ../cs_enforce.cpp:210
-msgid "Syntax: ENFORCE channel [what]"
-msgstr "Sintassi: ENFORCE canale [cosa]"
diff --git a/modules/extra/language/cs_enforce.nl_NL.po b/modules/extra/language/cs_enforce.nl_NL.po
deleted file mode 100644
index 935e8dce7..000000000
--- a/modules/extra/language/cs_enforce.nl_NL.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Dutch translations for cs_enforce
-# Engelse vertalingen voor het cs_enforce
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:07-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Dutch\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_enforce.cpp:127
-#, fuzzy
-msgid "Enforce various channel modes and set options"
-msgstr "    ENFORCE    Forceer enkele kanaalmodes en set-opties"
-
-#: ../cs_enforce.cpp:180
-msgid ""
-"Enforce various channel modes and set options. The channel\n"
-"option indicates what channel to enforce the modes and options\n"
-"on. The what option indicates what modes and options to\n"
-"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-"or +R. When left out, it defaults to SET.\n"
-" \n"
-"If what is SET, it will enforce SECUREOPS and RESTRICTED\n"
-"on the users currently in the channel, if they are set. Give\n"
-"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-"if it's not enabled."
-msgstr ""
-"Forceer enkele kannalmodes en set-opties. De kanaal optie\n"
-"geeft aan op welk kanaal de modes en opties geforceerd moeten\n"
-"worden. De wat optie geeft aan welke modes en opties\n"
-"geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n"
-"MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n"
-" \n"
-"Als er voor wat SET wordt ingevuld, zullen SECUREOPS en\n"
-"RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n"
-"maar alleen als die opties aangezet zijn voor het kanaal. Als\n"
-"SECUREOPS of RESTRICTED wordt gegeven voor wat zal die optie\n"
-"altijd geforceerd worden, ook als die niet is aangezet."
-
-#: ../cs_enforce.cpp:147 ../cs_enforce.cpp:152 ../cs_enforce.cpp:157
-#: ../cs_enforce.cpp:162 ../cs_enforce.cpp:167
-#, c-format
-msgid "Enforced %s"
-msgstr ""
-
-#: ../cs_enforce.cpp:193
-msgid ""
-"If what is MODES, it will enforce channelmode +R if it is\n"
-"set. If +R is specified for what, the +R channelmode will\n"
-"also be enforced, but even if it is not set. If it is not set,\n"
-"users will be banned to ensure they don't just rejoin."
-msgstr ""
-"Als er voor wat MODES wordt ingevuld, zal kanaalmode +R worden\n"
-"geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n"
-"zal kanaalmode +R worden geforceerd, maar ook als die niet aanstaat voor het "
-"kanaal. Als +R niet aan staat, zullen alle ook\n"
-"gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n"
-"kunnen komen."
-
-#: ../cs_enforce.cpp:198
-msgid ""
-"If what is MODES, nothing will be enforced, since it would\n"
-"enforce modes that the current ircd does not support. If +R is\n"
-"specified for what, an equalivant of channelmode +R on\n"
-"other ircds will be enforced. All users that are in the channel\n"
-"but have not identified for their nickname will be kicked and\n"
-"banned from the channel."
-msgstr ""
-"Als er voor wat MODES wordt ingevuld, zal er niks gebeuren.\n"
-"Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n"
-"server niet ondersteund wordt. Als +R wordt ingevuld voor wat\n"
-"zullen alle gebruikers die in het kanaal zitten maar zich niet\n"
-"hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n"
-"verbannen worden."
-
-#: ../cs_enforce.cpp:178 ../cs_enforce.cpp:210
-msgid "Syntax: ENFORCE channel [what]"
-msgstr "Syntax: ENFORCE kanaal [wat]"
diff --git a/modules/extra/language/cs_enforce.pt_PT.po b/modules/extra/language/cs_enforce.pt_PT.po
deleted file mode 100644
index 955ea87aa..000000000
--- a/modules/extra/language/cs_enforce.pt_PT.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Portuguese translations for cs_enforce
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:24-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Portuguese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_enforce.cpp:127
-#, fuzzy
-msgid "Enforce various channel modes and set options"
-msgstr ""
-"    ENFORCE    Verifica o cumprimento de vбrios modos de canal e opзхes "
-"ajustadas"
-
-#: ../cs_enforce.cpp:180
-msgid ""
-"Enforce various channel modes and set options. The channel\n"
-"option indicates what channel to enforce the modes and options\n"
-"on. The what option indicates what modes and options to\n"
-"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-"or +R. When left out, it defaults to SET.\n"
-" \n"
-"If what is SET, it will enforce SECUREOPS and RESTRICTED\n"
-"on the users currently in the channel, if they are set. Give\n"
-"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-"if it's not enabled."
-msgstr ""
-"Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas.\n"
-"O campo canal indica qual canal deve ter os modos e opзхes verificadas\n"
-"O campo opзгo indica quais modos e opзхes devem ser verificadas,\n"
-"e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n"
-"Quando deixado em branco, o padrгo й SET.\n"
-" \n"
-"Se opзгo for SET, serгo verificadas as opзхes SECUREOPS e RESTRICTED\n"
-"para usuбrios que estiverem no canal, caso elas estejam ativadas. Use\n"
-"SECUREOPS para verificar a opзгo SECUREOPS, mesmo que ela nгo esteja "
-"ativada\n"
-"Use RESTRICTED para verificar a opзгo RESTRICTED, mesmo que ela nгo esteja\n"
-"ativada."
-
-#: ../cs_enforce.cpp:147 ../cs_enforce.cpp:152 ../cs_enforce.cpp:157
-#: ../cs_enforce.cpp:162 ../cs_enforce.cpp:167
-#, c-format
-msgid "Enforced %s"
-msgstr "Verificado %s"
-
-#: ../cs_enforce.cpp:193
-msgid ""
-"If what is MODES, it will enforce channelmode +R if it is\n"
-"set. If +R is specified for what, the +R channelmode will\n"
-"also be enforced, but even if it is not set. If it is not set,\n"
-"users will be banned to ensure they don't just rejoin."
-msgstr ""
-"Se opзгo for MODES, serб verificado o modo de canal +R caso ele\n"
-"esteja ativado. Se +R for especificado para opзгo, o modo de canal\n"
-"+R tambйm serб verificado, mesmo que ele nгo esteja ativado. Se ele nгo\n"
-"estiver ativado, os usuбrios serгo banidos para evitar que reentrem no canal."
-
-#: ../cs_enforce.cpp:198
-msgid ""
-"If what is MODES, nothing will be enforced, since it would\n"
-"enforce modes that the current ircd does not support. If +R is\n"
-"specified for what, an equalivant of channelmode +R on\n"
-"other ircds will be enforced. All users that are in the channel\n"
-"but have not identified for their nickname will be kicked and\n"
-"banned from the channel."
-msgstr ""
-"Se opзгo for MODES, nada serб verificado, visto que isto poderia\n"
-"verificar modos que o IRCd atual nгo suporta. Se +R for especificado\n"
-"para opзгo, um equivalente ao modo de canal +R em outros IRCds\n"
-"serб verificado. Todos os usuбrios que estгo no canal, mas nгo estejam\n"
-"identificados para seus nicks serгo kickados e banidos do canal."
-
-#: ../cs_enforce.cpp:178 ../cs_enforce.cpp:210
-msgid "Syntax: ENFORCE channel [what]"
-msgstr "Sintaxe: ENFORCE canal [opзгo]"
diff --git a/modules/extra/language/cs_enforce.ru_RU.po b/modules/extra/language/cs_enforce.ru_RU.po
deleted file mode 100644
index 2beef37cd..000000000
--- a/modules/extra/language/cs_enforce.ru_RU.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Russian translations for cs_enforce
-# ?????????? ???????? ??? ?????? cs_enforce
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-25 21:38-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../cs_enforce.cpp:127
-#, fuzzy
-msgid "Enforce various channel modes and set options"
-msgstr ""
-"    ENFORCE    Перепроверка и установка различных режимов и опций канала"
-
-#: ../cs_enforce.cpp:180
-msgid ""
-"Enforce various channel modes and set options. The channel\n"
-"option indicates what channel to enforce the modes and options\n"
-"on. The what option indicates what modes and options to\n"
-"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-"or +R. When left out, it defaults to SET.\n"
-" \n"
-"If what is SET, it will enforce SECUREOPS and RESTRICTED\n"
-"on the users currently in the channel, if they are set. Give\n"
-"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-"if it's not enabled."
-msgstr ""
-"Перепроверка и установка различных режимов и опций канала.\n"
-"Параметр указывает какие опции или режимы канала должны быть\n"
-"перепроверены. В качестве параметра могут быть указаны: SET, SECUREOPS,\n"
-"RESTRICTED, MODES, или +R. Если параметр не указан, по-умолчанию будет SET.\n"
-" \n"
-"Если в качестве параметра указано SET, будут перепроверены опции\n"
-"SECUREOPS и RESTRICTED относительно пользователей на указанном канале\n"
-"(при условии, что опции включены). Отдельно указанный параметр SECUREOPS\n"
-"применит опцию SECUREOPS (даже если она НЕ установлена). Параметр\n"
-"RESTRICTED применит опцию RESTRICTED (даже если она НЕ установлена)"
-
-#: ../cs_enforce.cpp:147 ../cs_enforce.cpp:152 ../cs_enforce.cpp:157
-#: ../cs_enforce.cpp:162 ../cs_enforce.cpp:167
-#, c-format
-msgid "Enforced %s"
-msgstr "Перепроверено: %s"
-
-#: ../cs_enforce.cpp:193
-msgid ""
-"If what is MODES, it will enforce channelmode +R if it is\n"
-"set. If +R is specified for what, the +R channelmode will\n"
-"also be enforced, but even if it is not set. If it is not set,\n"
-"users will be banned to ensure they don't just rejoin."
-msgstr ""
-"Если в качестве параметра указано MODES, будет перепроверен режим +R\n"
-"(если он установлен). Отдельно указанный параметр +R применит\n"
-"канальный режим +R, даже если он не установлен, и забанит всех "
-"пользователей,\n"
-"которые не идентифицировались к своему нику или не имеют зарегистрированного "
-"ника."
-
-#: ../cs_enforce.cpp:198
-msgid ""
-"If what is MODES, nothing will be enforced, since it would\n"
-"enforce modes that the current ircd does not support. If +R is\n"
-"specified for what, an equalivant of channelmode +R on\n"
-"other ircds will be enforced. All users that are in the channel\n"
-"but have not identified for their nickname will be kicked and\n"
-"banned from the channel."
-msgstr ""
-"Если в качестве параметра указано MODES, перепроверка осуществлена\n"
-"НЕ БУДЕТ, так как текущий IRCD не поддерживает необходимые режимы.\n"
-"Отдельно указанный параметр +R применит канальный режим, эквивалентный\n"
-"режиму +R и забанит всех пользователей, которые не идентифицировались к "
-"своему\n"
-"нику или не имеют зарегистрированного ника."
-
-#: ../cs_enforce.cpp:178 ../cs_enforce.cpp:210
-msgid "Syntax: ENFORCE channel [what]"
-msgstr "Синтаксис: ENFORCE #канал параметр"
diff --git a/modules/extra/language/cs_tban.de_DE.po b/modules/extra/language/cs_tban.de_DE.po
deleted file mode 100644
index 37ae58466..000000000
--- a/modules/extra/language/cs_tban.de_DE.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# German translations for cs_tban
-# German messages for cs_tban
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-26 00:16-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: German\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_tban.cpp:85
-#, c-format
-msgid "%s banned from %s, will auto-expire in %s"
-msgstr "%s gebannt von %s, wird auto-auslaufen in %s"
-
-#: ../cs_tban.cpp:95
-msgid ""
-"Bans the given user from a channel for a specified length of\n"
-"time. If the ban is removed before by hand, it will NOT be replaced."
-msgstr ""
-"Bant ein User fьr eine bestimmte Zeit aus ein Channel\n"
-"Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt."
-
-#: ../cs_tban.cpp:61
-#, fuzzy
-msgid "Bans the user for a given length of time"
-msgstr "    TBAN       Bant ein User fьr eine bestimmte Zeit aus ein Channel"
-
-#: ../cs_tban.cpp:103
-msgid "Syntax: TBAN channel nick time"
-msgstr "Syntax: TBAN Channel Nickname Zeit"
diff --git a/modules/extra/language/cs_tban.it_IT.po b/modules/extra/language/cs_tban.it_IT.po
deleted file mode 100644
index 3989c74d7..000000000
--- a/modules/extra/language/cs_tban.it_IT.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Italian translations for cs_tban
-# Traduzioni italiane per il cs_tban
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-26 00:22-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Italian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_tban.cpp:85
-#, c-format
-msgid "%s banned from %s, will auto-expire in %s"
-msgstr "%s bannato da %s, scadrа automaticamente tra %s"
-
-#: ../cs_tban.cpp:95
-msgid ""
-"Bans the given user from a channel for a specified length of\n"
-"time. If the ban is removed before by hand, it will NOT be replaced."
-msgstr ""
-"Banna l'utente specificato da un canale per un periodo di tempo\n"
-"specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа "
-"rimpiazzato."
-
-#: ../cs_tban.cpp:61
-#, fuzzy
-msgid "Bans the user for a given length of time"
-msgstr "    TBAN       Banna l'utente per un periodo di tempo specificato"
-
-#: ../cs_tban.cpp:103
-msgid "Syntax: TBAN channel nick time"
-msgstr "Sintassi: TBAN canale nick tempo"
diff --git a/modules/extra/language/cs_tban.nl_NL.po b/modules/extra/language/cs_tban.nl_NL.po
deleted file mode 100644
index 18239f383..000000000
--- a/modules/extra/language/cs_tban.nl_NL.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Dutch translations for cs_tban
-# Engelse vertalingen voor het cs_tban
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-26 00:15-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Dutch\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_tban.cpp:85
-#, c-format
-msgid "%s banned from %s, will auto-expire in %s"
-msgstr "%s verbannen van %s, zal verlopen in %s"
-
-#: ../cs_tban.cpp:95
-msgid ""
-"Bans the given user from a channel for a specified length of\n"
-"time. If the ban is removed before by hand, it will NOT be replaced."
-msgstr ""
-"Verbant de gegeven gebruiken van het gegeven kanaal voor de\n"
-"gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n"
-"zal deze NIET worden vervangen."
-
-#: ../cs_tban.cpp:61
-#, fuzzy
-msgid "Bans the user for a given length of time"
-msgstr "    TBAN       Verban een gebruiker voor een bepaalde tijd"
-
-#: ../cs_tban.cpp:103
-msgid "Syntax: TBAN channel nick time"
-msgstr "Syntax: TBAN kanaal nick tijd"
diff --git a/modules/extra/language/cs_tban.pt_PT.po b/modules/extra/language/cs_tban.pt_PT.po
deleted file mode 100644
index 944d977fd..000000000
--- a/modules/extra/language/cs_tban.pt_PT.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Portuguese translations for cs_tban
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-26 00:18-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Portuguese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../cs_tban.cpp:85
-#, c-format
-msgid "%s banned from %s, will auto-expire in %s"
-msgstr "%s foi banido do %s, irб auto-expirar em %s"
-
-#: ../cs_tban.cpp:95
-msgid ""
-"Bans the given user from a channel for a specified length of\n"
-"time. If the ban is removed before by hand, it will NOT be replaced."
-msgstr ""
-"Bane de um canal o usuбrio especificado por um determinado perнodo de\n"
-"tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб "
-"recolocado."
-
-#: ../cs_tban.cpp:61
-#, fuzzy
-msgid "Bans the user for a given length of time"
-msgstr "    TBAN       Bane o usuбrio por um determinado perнodo de tempo"
-
-#: ../cs_tban.cpp:103
-msgid "Syntax: TBAN channel nick time"
-msgstr "Sintaxe: TBAN canal nick tempo"
diff --git a/modules/extra/language/cs_tban.ru_RU.po b/modules/extra/language/cs_tban.ru_RU.po
deleted file mode 100644
index 881c9ea79..000000000
--- a/modules/extra/language/cs_tban.ru_RU.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Russian translations for cs_tban
-# ?????????? ???????? ??? ?????? cs_tban
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as the Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:49-0400\n"
-"PO-Revision-Date: 2010-09-26 00:20-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../cs_tban.cpp:85
-#, c-format
-msgid "%s banned from %s, will auto-expire in %s"
-msgstr "Установленный бан %s на канале %s истечет через %s секунд"
-
-#: ../cs_tban.cpp:95
-msgid ""
-"Bans the given user from a channel for a specified length of\n"
-"time. If the ban is removed before by hand, it will NOT be replaced."
-msgstr ""
-"Банит пользователя на указанный промежуток времени в секундах\n"
-"Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n"
-"переустановлен сервисами автоматически!"
-
-#: ../cs_tban.cpp:61
-#, fuzzy
-msgid "Bans the user for a given length of time"
-msgstr "    TBAN       Банит пользователя на указанный промежуток времени"
-
-#: ../cs_tban.cpp:103
-msgid "Syntax: TBAN channel nick time"
-msgstr "Синтаксис: TBAN #канал ник время"
diff --git a/modules/extra/language/hs_request.it_IT.po b/modules/extra/language/hs_request.it_IT.po
deleted file mode 100644
index 5fa437bad..000000000
--- a/modules/extra/language/hs_request.it_IT.po
+++ /dev/null
@@ -1,149 +0,0 @@
-# Italian translations for hs_request
-# Traduzioni italiane per il hs_request
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:50-0400\n"
-"PO-Revision-Date: 2010-09-25 23:42-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Italian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../hs_request.cpp:267
-#, c-format
-msgid "#%d Nick:%s, vhost:%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:265
-#, c-format
-msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:180 ../hs_request.cpp:238
-msgid "A memo informing the user will also be sent."
-msgstr "Viene inviato un memo per informare l'utente."
-
-#: ../hs_request.cpp:178
-msgid "Activate the requested vHost for the given nick."
-msgstr "Attiva il vHost richiesto per il nick specificato."
-
-#: ../hs_request.cpp:139
-#, fuzzy
-msgid "Approve the requested vHost of a user"
-msgstr "Attiva il vHost richiesto per il nick specificato."
-
-#: ../hs_request.cpp:286
-msgid "Convenience command for LIST +req"
-msgstr ""
-
-#: ../hs_request.cpp:271
-#, c-format
-msgid "Displayed all records (Count: %d)"
-msgstr ""
-
-#: ../hs_request.cpp:166 ../hs_request.cpp:227
-#, c-format
-msgid "No request for nick %s found."
-msgstr "Nessuna richiesta trovata per il nick %s."
-
-#: ../hs_request.cpp:105
-#, c-format
-msgid "Please wait %d seconds before requesting a new vHost"
-msgstr "Prego attendere %d secondi prima di richiedere un nuovo vHost"
-
-#: ../hs_request.cpp:236
-msgid "Reject the requested vHost for the given nick."
-msgstr "Rifiuta il vHost richiesto per il nick specificato."
-
-#: ../hs_request.cpp:196
-#, fuzzy
-msgid "Reject the requested vHost of a user"
-msgstr "Rifiuta il vHost richiesto per il nick specificato."
-
-#: ../hs_request.cpp:52
-#, fuzzy
-msgid "Request a vHost for your nick"
-msgstr "    REQUEST     Richiede un vHost per il tuo nick"
-
-#: ../hs_request.cpp:122
-msgid ""
-"Request the given vHost to be actived for your nick by the\n"
-"network administrators. Please be patient while your request\n"
-"is being considered."
-msgstr ""
-"Richiede l'attivazione del vHost specificato per il tuo nick da parte\n"
-"degli amministratori di rete. Sei pregato di pazientare finchи la tua\n"
-"richiesta viene elaborata."
-
-#: ../hs_request.cpp:176 ../hs_request.cpp:187
-msgid "Syntax: ACTIVATE nick"
-msgstr "Sintassi: ACTIVATE nick"
-
-#: ../hs_request.cpp:234 ../hs_request.cpp:245
-msgid "Syntax: REJECT nick"
-msgstr "Sintassi: REJECT nick"
-
-#: ../hs_request.cpp:68 ../hs_request.cpp:120 ../hs_request.cpp:130
-msgid "Syntax: REQUEST vhost"
-msgstr "Sintassi: REQUEST vhost"
-
-#: ../hs_request.cpp:296
-msgid "Syntax: WAITING"
-msgstr "Sintassi: WAITING"
-
-#: ../hs_request.cpp:298
-msgid ""
-"This command is provided for convenience. It is essentially\n"
-"the same as performing a LIST +req ."
-msgstr ""
-"Questo comando и per comoditа. Praticamente и la stessa cosa che\n"
-"eseguire un LIST +req ."
-
-#: ../hs_request.cpp:111
-msgid "Your vHost has been requested"
-msgstr "Il tuo vHost и stato richiesto"
-
-#: ../hs_request.cpp:158
-msgid "[auto memo] Your requested vHost has been approved."
-msgstr "[auto memo] Il vHost da te richiesto и stato approvato."
-
-#: ../hs_request.cpp:218
-msgid "[auto memo] Your requested vHost has been rejected."
-msgstr "[auto memo] Il vHost da te richiesto и stato rifiutato."
-
-#: ../hs_request.cpp:216
-#, c-format
-msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
-msgstr "[auto memo] Il vHost da te richiesto и stato rifiutato. Motivo: %s"
-
-#: ../hs_request.cpp:438
-#, fuzzy, c-format
-msgid "[auto memo] vHost %s has been requested by %s."
-msgstr "[auto memo] и stato richiesto il vHost %s."
-
-#: ../hs_request.cpp:160
-#, c-format
-msgid "vHost for %s has been activated"
-msgstr "Il vHost per %s и stato attivato"
-
-#: ../hs_request.cpp:223
-#, c-format
-msgid "vHost for %s has been rejected"
-msgstr "Il vHost per %s и stato rifiutato"
-
-#~ msgid ""
-#~ "    ACTIVATE    Approve the requested vHost of a user\n"
-#~ "    REJECT      Reject the requested vHost of a user\n"
-#~ "    WAITING     Convenience command for LIST +req"
-#~ msgstr ""
-#~ "    ACTIVATE    Approva il vHost richiesto di un utente\n"
-#~ "    REJECT      Rifiuta il vHost richiesto di un utente\n"
-#~ "    WAITING     Comando per LIST +req"
diff --git a/modules/extra/language/hs_request.nl_NL.po b/modules/extra/language/hs_request.nl_NL.po
deleted file mode 100644
index 2f1f065a1..000000000
--- a/modules/extra/language/hs_request.nl_NL.po
+++ /dev/null
@@ -1,150 +0,0 @@
-# Dutch translations for hs_request
-# Engelse vertalingen voor het hs_request
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:50-0400\n"
-"PO-Revision-Date: 2010-09-25 22:26-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Dutch\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../hs_request.cpp:267
-#, c-format
-msgid "#%d Nick:%s, vhost:%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:265
-#, c-format
-msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:180 ../hs_request.cpp:238
-msgid "A memo informing the user will also be sent."
-msgstr ""
-"Een memo die de gebruiker op de hoogste stelt zal ook worden verstuurd."
-
-#: ../hs_request.cpp:178
-msgid "Activate the requested vHost for the given nick."
-msgstr "Activeer de aangevraagde vHost voor de gegeven nick."
-
-#: ../hs_request.cpp:139
-#, fuzzy
-msgid "Approve the requested vHost of a user"
-msgstr "Activeer de aangevraagde vHost voor de gegeven nick."
-
-#: ../hs_request.cpp:286
-msgid "Convenience command for LIST +req"
-msgstr ""
-
-#: ../hs_request.cpp:271
-#, c-format
-msgid "Displayed all records (Count: %d)"
-msgstr ""
-
-#: ../hs_request.cpp:166 ../hs_request.cpp:227
-#, c-format
-msgid "No request for nick %s found."
-msgstr "Geen aanvraag voor nick %s gevonden."
-
-#: ../hs_request.cpp:105
-#, c-format
-msgid "Please wait %d seconds before requesting a new vHost"
-msgstr "Wacht %d seconden voor je een nieuwe vHost aanvraagt"
-
-#: ../hs_request.cpp:236
-msgid "Reject the requested vHost for the given nick."
-msgstr "Keur de aangevraagde vHost voor de gegeven nick af."
-
-#: ../hs_request.cpp:196
-#, fuzzy
-msgid "Reject the requested vHost of a user"
-msgstr "Keur de aangevraagde vHost voor de gegeven nick af."
-
-#: ../hs_request.cpp:52
-#, fuzzy
-msgid "Request a vHost for your nick"
-msgstr "    REQUEST     Vraag een vHost aan voor je nick"
-
-#: ../hs_request.cpp:122
-msgid ""
-"Request the given vHost to be actived for your nick by the\n"
-"network administrators. Please be patient while your request\n"
-"is being considered."
-msgstr ""
-"Verzoek de gegeven vHost te activeren voor jouw nick bij de\n"
-"netwerk beheerders. Het kan even duren voordat je aanvraag\n"
-"afgehandeld wordt."
-
-#: ../hs_request.cpp:176 ../hs_request.cpp:187
-msgid "Syntax: ACTIVATE nick"
-msgstr "Gebruik: ACTIVATE nick"
-
-#: ../hs_request.cpp:234 ../hs_request.cpp:245
-msgid "Syntax: REJECT nick"
-msgstr "Gebruik: REJECT nick"
-
-#: ../hs_request.cpp:68 ../hs_request.cpp:120 ../hs_request.cpp:130
-msgid "Syntax: REQUEST vhost"
-msgstr "Gebruik: REQUEST vhost"
-
-#: ../hs_request.cpp:296
-msgid "Syntax: WAITING"
-msgstr "Gebruik: WAITING"
-
-#: ../hs_request.cpp:298
-msgid ""
-"This command is provided for convenience. It is essentially\n"
-"the same as performing a LIST +req ."
-msgstr ""
-"Dit commando is beschikbaar als handigheid. Het is simpelweg\n"
-"hetzelfde als LIST +req ."
-
-#: ../hs_request.cpp:111
-msgid "Your vHost has been requested"
-msgstr "Je vHost is aangevraagd"
-
-#: ../hs_request.cpp:158
-msgid "[auto memo] Your requested vHost has been approved."
-msgstr "[auto memo] Je aangevraagde vHost is geaccepteerd."
-
-#: ../hs_request.cpp:218
-msgid "[auto memo] Your requested vHost has been rejected."
-msgstr "[auto memo] Je aangevraagde vHost is afgekeurd."
-
-#: ../hs_request.cpp:216
-#, c-format
-msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
-msgstr "[auto memo] Je aangevraagde vHost is afgekeurd. Reden: %s"
-
-#: ../hs_request.cpp:438
-#, fuzzy, c-format
-msgid "[auto memo] vHost %s has been requested by %s."
-msgstr "[auto memo] vHost %s is aangevraagd."
-
-#: ../hs_request.cpp:160
-#, c-format
-msgid "vHost for %s has been activated"
-msgstr "vHost voor %s is geactiveerd"
-
-#: ../hs_request.cpp:223
-#, c-format
-msgid "vHost for %s has been rejected"
-msgstr "vHost voor %s is afgekeurd"
-
-#~ msgid ""
-#~ "    ACTIVATE    Approve the requested vHost of a user\n"
-#~ "    REJECT      Reject the requested vHost of a user\n"
-#~ "    WAITING     Convenience command for LIST +req"
-#~ msgstr ""
-#~ "    ACTIVATE    Activeer de aangevraagde vHost voor een gebruiker\n"
-#~ "    REJECT      Keur de aangevraagde vHost voor een gebruiker af\n"
-#~ "    WAITING     Snelkoppeling naar LIST +req"
diff --git a/modules/extra/language/hs_request.pt_PT.po b/modules/extra/language/hs_request.pt_PT.po
deleted file mode 100644
index 74f767395..000000000
--- a/modules/extra/language/hs_request.pt_PT.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Portuguese translations for hs_request
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:50-0400\n"
-"PO-Revision-Date: 2010-09-25 22:48-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Portuguese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../hs_request.cpp:267
-#, c-format
-msgid "#%d Nick:%s, vhost:%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:265
-#, c-format
-msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:180 ../hs_request.cpp:238
-msgid "A memo informing the user will also be sent."
-msgstr "Um memo informando o usuбrio tambйm serб enviado."
-
-#: ../hs_request.cpp:178
-msgid "Activate the requested vHost for the given nick."
-msgstr "Ativa o vHost solicitado para o nick fornecido."
-
-#: ../hs_request.cpp:139
-#, fuzzy
-msgid "Approve the requested vHost of a user"
-msgstr "Ativa o vHost solicitado para o nick fornecido."
-
-#: ../hs_request.cpp:286
-msgid "Convenience command for LIST +req"
-msgstr ""
-
-#: ../hs_request.cpp:271
-#, c-format
-msgid "Displayed all records (Count: %d)"
-msgstr ""
-
-#: ../hs_request.cpp:166 ../hs_request.cpp:227
-#, c-format
-msgid "No request for nick %s found."
-msgstr "Nenhum pedido encontrado para o nick %s."
-
-#: ../hs_request.cpp:105
-#, c-format
-msgid "Please wait %d seconds before requesting a new vHost"
-msgstr "Por favor, espere %d segundos antes de fazer um novo pedido de vHost"
-
-#: ../hs_request.cpp:236
-msgid "Reject the requested vHost for the given nick."
-msgstr "Recusa o pedido de vHost para o nick fornecido."
-
-#: ../hs_request.cpp:196
-#, fuzzy
-msgid "Reject the requested vHost of a user"
-msgstr "Recusa o pedido de vHost para o nick fornecido."
-
-#: ../hs_request.cpp:52
-#, fuzzy
-msgid "Request a vHost for your nick"
-msgstr "    REQUEST     Request a vHost for your nick"
-
-#: ../hs_request.cpp:122
-msgid ""
-"Request the given vHost to be actived for your nick by the\n"
-"network administrators. Please be patient while your request\n"
-"is being considered."
-msgstr ""
-"Solicita a ativaзгo do vHost fornecido em seu nick pelos\n"
-"administradores da rede. Por favor, tenha paciкncia\n"
-"enquanto seu pedido й analisado."
-
-#: ../hs_request.cpp:176 ../hs_request.cpp:187
-msgid "Syntax: ACTIVATE nick"
-msgstr "Sintaxe: ACTIVATE nick"
-
-#: ../hs_request.cpp:234 ../hs_request.cpp:245
-msgid "Syntax: REJECT nick"
-msgstr "Sintaxe: REJECT nick"
-
-#: ../hs_request.cpp:68 ../hs_request.cpp:120 ../hs_request.cpp:130
-msgid "Syntax: REQUEST vhost"
-msgstr "Sintaxe: REQUEST vhost"
-
-#: ../hs_request.cpp:296
-msgid "Syntax: WAITING"
-msgstr "Sintaxe: WAITING"
-
-#: ../hs_request.cpp:298
-msgid ""
-"This command is provided for convenience. It is essentially\n"
-"the same as performing a LIST +req ."
-msgstr ""
-"Este comando й usado por conveniкncia. Й essencialmente\n"
-"o mesmo que fazer um LIST +req"
-
-#: ../hs_request.cpp:111
-msgid "Your vHost has been requested"
-msgstr "Seu pedido de vHost foi encaminhado"
-
-#: ../hs_request.cpp:158
-msgid "[auto memo] Your requested vHost has been approved."
-msgstr "[Auto Memo] Seu pedido de vHost foi aprovado."
-
-#: ../hs_request.cpp:218
-msgid "[auto memo] Your requested vHost has been rejected."
-msgstr "[Auto Memo] Seu pedido de vHost foi recusado."
-
-#: ../hs_request.cpp:216
-#, c-format
-msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
-msgstr "[Auto Memo] Seu pedido de vHost foi recusado. Motivo: %s"
-
-#: ../hs_request.cpp:438
-#, fuzzy, c-format
-msgid "[auto memo] vHost %s has been requested by %s."
-msgstr "[Auto Memo] O vHost %s foi solicitado."
-
-#: ../hs_request.cpp:160
-#, c-format
-msgid "vHost for %s has been activated"
-msgstr "O vHost para %s foi ativado"
-
-#: ../hs_request.cpp:223
-#, c-format
-msgid "vHost for %s has been rejected"
-msgstr "O vHost de %s foi recusado"
-
-#~ msgid ""
-#~ "    ACTIVATE    Approve the requested vHost of a user\n"
-#~ "    REJECT      Reject the requested vHost of a user\n"
-#~ "    WAITING     Convenience command for LIST +req"
-#~ msgstr ""
-#~ "    ACTIVATE    Aprova o pedido de vHost de um usuбrio\n"
-#~ "    REJECT      Recusa o pedido de vHost de um usuбrio\n"
-#~ "    WAITING     Comando para LISTAR +req"
diff --git a/modules/extra/language/hs_request.ru_RU.po b/modules/extra/language/hs_request.ru_RU.po
deleted file mode 100644
index 81c905802..000000000
--- a/modules/extra/language/hs_request.ru_RU.po
+++ /dev/null
@@ -1,151 +0,0 @@
-# Russian translations for hs_request
-# ?????????? ???????? ??? ?????? PACKAGE.
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-17 13:50-0400\n"
-"PO-Revision-Date: 2010-09-25 23:27-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../hs_request.cpp:267
-#, c-format
-msgid "#%d Nick:%s, vhost:%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:265
-#, c-format
-msgid "#%d Nick:%s, vhost:%s@%s (%s - %s)"
-msgstr ""
-
-#: ../hs_request.cpp:180 ../hs_request.cpp:238
-msgid "A memo informing the user will also be sent."
-msgstr "Пользователю будет послано авто-уведомление об активации его запроса."
-
-#: ../hs_request.cpp:178
-msgid "Activate the requested vHost for the given nick."
-msgstr "Утвердить запрашиваемый vHost для указанного ника."
-
-#: ../hs_request.cpp:139
-#, fuzzy
-msgid "Approve the requested vHost of a user"
-msgstr "Утвердить запрашиваемый vHost для указанного ника."
-
-#: ../hs_request.cpp:286
-msgid "Convenience command for LIST +req"
-msgstr ""
-
-#: ../hs_request.cpp:271
-#, c-format
-msgid "Displayed all records (Count: %d)"
-msgstr ""
-
-#: ../hs_request.cpp:166 ../hs_request.cpp:227
-#, c-format
-msgid "No request for nick %s found."
-msgstr "Запрос на vHost для ника %s не найден."
-
-#: ../hs_request.cpp:105
-#, c-format
-msgid "Please wait %d seconds before requesting a new vHost"
-msgstr "Пожалуйста, подождите %d секунд, прежде чем запрашивать новый vHost"
-
-#: ../hs_request.cpp:236
-msgid "Reject the requested vHost for the given nick."
-msgstr "Отклонить запрашиваемый vHost для указанного ника."
-
-#: ../hs_request.cpp:196
-#, fuzzy
-msgid "Reject the requested vHost of a user"
-msgstr "Отклонить запрашиваемый vHost для указанного ника."
-
-#: ../hs_request.cpp:52
-#, fuzzy
-msgid "Request a vHost for your nick"
-msgstr "    REQUEST     Запрос на vHost для вашего текущего ника"
-
-#: ../hs_request.cpp:122
-msgid ""
-"Request the given vHost to be actived for your nick by the\n"
-"network administrators. Please be patient while your request\n"
-"is being considered."
-msgstr ""
-"Отправляет запрос на активацию vHost, который будет рассмотрен одним из\n"
-"администраторов сети. Просьба проявить терпение, пока запрос\n"
-"рассматривается администрацией."
-
-#: ../hs_request.cpp:176 ../hs_request.cpp:187
-msgid "Syntax: ACTIVATE nick"
-msgstr "Синтаксис: ACTIVATE ник"
-
-#: ../hs_request.cpp:234 ../hs_request.cpp:245
-msgid "Syntax: REJECT nick"
-msgstr "Синтаксис: REJECT ник"
-
-#: ../hs_request.cpp:68 ../hs_request.cpp:120 ../hs_request.cpp:130
-msgid "Syntax: REQUEST vhost"
-msgstr "Синтаксис: REQUEST vHost"
-
-#: ../hs_request.cpp:296
-msgid "Syntax: WAITING"
-msgstr "Синтаксис: WAITING"
-
-#: ../hs_request.cpp:298
-msgid ""
-"This command is provided for convenience. It is essentially\n"
-"the same as performing a LIST +req ."
-msgstr ""
-"Данная команда создана для удобства использования и выводит список "
-"запросов,\n"
-"ожидающих обработки. Аналогичная команда: LIST +req ."
-
-#: ../hs_request.cpp:111
-msgid "Your vHost has been requested"
-msgstr "Ваш запрос на vHost отправлен."
-
-#: ../hs_request.cpp:158
-msgid "[auto memo] Your requested vHost has been approved."
-msgstr "[авто-сообщение] Запрашиваемый вами vHost утвержден и активирован."
-
-#: ../hs_request.cpp:218
-msgid "[auto memo] Your requested vHost has been rejected."
-msgstr "[авто-сообщение] Запрашиваемый вами vHost отклонен."
-
-#: ../hs_request.cpp:216
-#, c-format
-msgid "[auto memo] Your requested vHost has been rejected. Reason: %s"
-msgstr "[авто-сообщение] Запрашиваемый вами vHost отклонен. Причина: %s"
-
-#: ../hs_request.cpp:438
-#, fuzzy, c-format
-msgid "[auto memo] vHost %s has been requested by %s."
-msgstr "[авто-сообщение] Был запрошен vHost %s"
-
-#: ../hs_request.cpp:160
-#, c-format
-msgid "vHost for %s has been activated"
-msgstr "vHost для %s успешно активирован"
-
-#: ../hs_request.cpp:223
-#, c-format
-msgid "vHost for %s has been rejected"
-msgstr "vHost для %s отклонен."
-
-#~ msgid ""
-#~ "    ACTIVATE    Approve the requested vHost of a user\n"
-#~ "    REJECT      Reject the requested vHost of a user\n"
-#~ "    WAITING     Convenience command for LIST +req"
-#~ msgstr ""
-#~ "    ACTIVATE    Утвердить запрашиваемый пользователем  vHost\n"
-#~ "    REJECT      Отклонить запрашиваемый пользователем  vHost\n"
-#~ "    WAITING     Список запросов ожидающих обработки (аналог LIST +req)"
diff --git a/modules/extra/language/ns_maxemail.de_DE.po b/modules/extra/language/ns_maxemail.de_DE.po
deleted file mode 100644
index fe1f3aef4..000000000
--- a/modules/extra/language/ns_maxemail.de_DE.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# German translations for ns_maxemail
-# German messages for ns_maxemail
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 03:41-0500\n"
-"PO-Revision-Date: 2010-09-26 00:03-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: German\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../ns_maxemail.cpp:33
-#, fuzzy, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr "Die angegebene eMail hat die limit Begrenzung von %d User erreicht."
-
-#: ../ns_maxemail.cpp:31
-#, fuzzy
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "Die angegebene eMail hat die limit Begrenzung von 1 User erreicht."
diff --git a/modules/extra/language/ns_maxemail.it_IT.po b/modules/extra/language/ns_maxemail.it_IT.po
deleted file mode 100644
index 1cd1a4083..000000000
--- a/modules/extra/language/ns_maxemail.it_IT.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Italian translations for ns_maxemail
-# Traduzioni italiane per il ns_maxemail
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 03:41-0500\n"
-"PO-Revision-Date: 2010-09-26 00:11-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Italian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../ns_maxemail.cpp:33
-#, fuzzy, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-"L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di %d "
-"utenti."
-
-#: ../ns_maxemail.cpp:31
-#, fuzzy
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr ""
-"L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di 1 "
-"utente."
diff --git a/modules/extra/language/ns_maxemail.nl_NL.po b/modules/extra/language/ns_maxemail.nl_NL.po
deleted file mode 100644
index fb84c786a..000000000
--- a/modules/extra/language/ns_maxemail.nl_NL.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Dutch translations for ns_maxemail
-# Engelse vertalingen voor het ns_maxemail
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 03:41-0500\n"
-"PO-Revision-Date: 2010-09-25 23:57-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Dutch\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../ns_maxemail.cpp:33
-#, fuzzy, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr "Het gegeven email adres heeft de limiet van %d gebruikers bereikt."
-
-#: ../ns_maxemail.cpp:31
-#, fuzzy
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "Het gegeven email adres heeft de limiet van 1 gebruiker bereikt."
diff --git a/modules/extra/language/ns_maxemail.pt_PT.po b/modules/extra/language/ns_maxemail.pt_PT.po
deleted file mode 100644
index ff807f582..000000000
--- a/modules/extra/language/ns_maxemail.pt_PT.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Portuguese translations for ns_maxemail
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 03:41-0500\n"
-"PO-Revision-Date: 2010-09-26 00:05-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Portuguese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../ns_maxemail.cpp:33
-#, fuzzy, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-"O endereзo de email fornecido alcanзou seu limite de uso de %d usuбrios."
-
-#: ../ns_maxemail.cpp:31
-#, fuzzy
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "O endereзo de email fornecido alcanзou seu limite de uso de 1 usuбrio."
diff --git a/modules/extra/language/ns_maxemail.ru_RU.po b/modules/extra/language/ns_maxemail.ru_RU.po
deleted file mode 100644
index 1fa267d55..000000000
--- a/modules/extra/language/ns_maxemail.ru_RU.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Russian translations for ns_maxemail
-# ?????????? ???????? ??? ?????? ns_maxemail
-# Copyright (C) 2011 Anope Team
-# This file is distributed under the same license as Anope IRC Services
-# Adam <adam@anope.org>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Anope\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-04 03:41-0500\n"
-"PO-Revision-Date: 2010-09-26 00:07-0400\n"
-"Last-Translator: Adam <adam@anope.org>\n"
-"Language-Team: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../ns_maxemail.cpp:33
-#, fuzzy, c-format
-msgid "The given email address has reached its usage limit of %d users."
-msgstr ""
-"Указанный вами email-адрес используется максимально допустимое кол-во раз: %d"
-
-#: ../ns_maxemail.cpp:31
-#, fuzzy
-msgid "The given email address has reached its usage limit of 1 user."
-msgstr "Указанный вами email-адрес уже кем-то используется."
diff --git a/modules/core/botserv.h b/modules/pseudoclients/botserv.h
index 5fa03f870..5fa03f870 100644
--- a/modules/core/botserv.h
+++ b/modules/pseudoclients/botserv.h
diff --git a/modules/core/bs_main.cpp b/modules/pseudoclients/bs_main.cpp
index 69eab6040..69eab6040 100644
--- a/modules/core/bs_main.cpp
+++ b/modules/pseudoclients/bs_main.cpp
diff --git a/modules/core/cs_main.cpp b/modules/pseudoclients/cs_main.cpp
index 5c490e4ff..5c490e4ff 100644
--- a/modules/core/cs_main.cpp
+++ b/modules/pseudoclients/cs_main.cpp
diff --git a/modules/core/gl_main.cpp b/modules/pseudoclients/gl_main.cpp
index c7ccf9209..c7ccf9209 100644
--- a/modules/core/gl_main.cpp
+++ b/modules/pseudoclients/gl_main.cpp
diff --git a/modules/core/global.h b/modules/pseudoclients/global.h
index 454e879c2..454e879c2 100644
--- a/modules/core/global.h
+++ b/modules/pseudoclients/global.h
diff --git a/modules/core/hs_main.cpp b/modules/pseudoclients/hs_main.cpp
index a6cc6bbb7..a6cc6bbb7 100644
--- a/modules/core/hs_main.cpp
+++ b/modules/pseudoclients/hs_main.cpp
diff --git a/modules/core/memoserv.h b/modules/pseudoclients/memoserv.h
index 0bf0c79ca..0bf0c79ca 100644
--- a/modules/core/memoserv.h
+++ b/modules/pseudoclients/memoserv.h
diff --git a/modules/core/ms_main.cpp b/modules/pseudoclients/ms_main.cpp
index bb6d7847e..bb6d7847e 100644
--- a/modules/core/ms_main.cpp
+++ b/modules/pseudoclients/ms_main.cpp
diff --git a/modules/core/nickserv.h b/modules/pseudoclients/nickserv.h
index b58dbd65f..b58dbd65f 100644
--- a/modules/core/nickserv.h
+++ b/modules/pseudoclients/nickserv.h
diff --git a/modules/core/ns_main.cpp b/modules/pseudoclients/ns_main.cpp
index 57323d0a5..57323d0a5 100644
--- a/modules/core/ns_main.cpp
+++ b/modules/pseudoclients/ns_main.cpp
diff --git a/modules/core/os_main.cpp b/modules/pseudoclients/os_main.cpp
index b555b9ede..b555b9ede 100644
--- a/modules/core/os_main.cpp
+++ b/modules/pseudoclients/os_main.cpp
diff --git a/modules/third/README b/modules/third/README
new file mode 100644
index 000000000..f960fba3e
--- /dev/null
+++ b/modules/third/README
@@ -0,0 +1,2 @@
+Third party modules, eg, modules not shipped with Anope are to be placed here.
+After doing so, run ./Config, make, make install and with some luck your module will work!
diff --git a/modules/extra/language/CMakeLists.txt b/modules/third/language/CMakeLists.txt
index af4dd90a6..af4dd90a6 100644
--- a/modules/extra/language/CMakeLists.txt
+++ b/modules/third/language/CMakeLists.txt
diff --git a/modules/third/language/README b/modules/third/language/README
new file mode 100644
index 000000000..c86eeefba
--- /dev/null
+++ b/modules/third/language/README
@@ -0,0 +1 @@
+Language files for third party modules are to go here.
diff --git a/modules/extra/language/update.sh b/modules/third/language/update.sh
index 1f16ea961..1f16ea961 100755
--- a/modules/extra/language/update.sh
+++ b/modules/third/language/update.sh