Merge default.

[irc/quakenet/newserv.git] / chanserv / chanserv_messages.h

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index cdd88b298e4f70c66ffa72c322e5bf31e291e64c..a562f909fef5acf1ebd4c05b01a8fce32fb009d8 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -56,6 +56,7 @@ BeginMessages() {
   msg(QM_NOCHANBANAUTOREMOVE, "Bans on $0 will not be automatically removed.", "s"),
   msg(QM_INVALIDCHANNAME, "$0 is not a valid channel name.", "s"),
   msg(QM_ALREADYREGISTERED, "$0 is already registered.", "s"),
+  msg(QM_TOOMANYCHANNELS, "User is known on too many channels.", ""),
   msg(QM_CURUSERFLAGS, "User flags for $0: $1", "ss"),
   msg(QM_WELCOMEMESSAGEIS, "Welcome message for $0: $1", "ss"),
   msg(QM_GLOBALINFO, "Default info line: $0", "s"),
@@ -106,7 +107,7 @@ BeginMessages() {
   msg(QM_MAILTHROTTLED, "Sorry, but you have already requested a password. You will have to wait atleast $0 hours, before requesting again.", "g"),
   msg(QM_MAILQUEUED, "Mail queued for delivery", ""),
   msg(QM_PWDONTMATCH, "Sorry, but passwords do not match", ""),
-  msg(QM_PWTOSHORT, "Sorry, but new password is to short", ""),
+  msg(QM_PWTOSHORT, "Sorry, but new password is too short", ""),
   msg(QM_PWCHANGED, "Ok, password changed", ""),
   msg(QM_INVALIDDURATION2, "Duration too long or invalid: $0", "s"),
   msg(QM_EMAILCHANGED, "Ok, email changed to \"$0\"", "s"),
@@ -227,11 +228,22 @@ BeginMessages() {
   msg(QM_PASSEMAILCHANGED, "Auth failed: account password has been changed since you logged in.", ""),
   msg(QM_REASONREQUIRED, "Supply a decent reason.", ""),
   msg(QM_BYPASSINGSUSPEND,"NOTE: $0 is suspended, bypassing suspension.", "s"),
-  msg(QM_ACHIEVEMENTUNLOCKED,"[ACHIEVEMENT UNLOCKED!] $0 ($1 points).","sd"),
-  msg(QM_ACHIEVEMENTLISTHEADER,"You have unlocked the following achievements:",""),
-  msg(QM_ACHIEVEMENTLIST,"$0 ($1 points)","sd"),
+  msg(QM_ACHIEVEMENTUNLOCKED,"ACHIEVEMENT UNLOCKED: [$1] $0","sd"),
+  msg(QM_ACHIEVEMENTLISTHEADER,"User $0 has unlocked the following achievements:","s"),
+  msg(QM_ACHIEVEMENTLISTMEHEADER,"You have unlocked the following achievements:",""),
   msg(QM_ACHIEVEMENTLISTEND,"End of list ($0 total achievement points).","d"),
-  msg(QM_NOACHIEVEMENTS,"You do not have any achievements yet.",""),
+  msg(QM_NOACHIEVEMENTS,"User $0 does not have any achievements yet.","s"),
+  msg(QM_ACHIEVEMENTCOMPARETIE,"End of list.  It's a tie!",""),
+  msg(QM_ACHIEVEMENTCOMPARERESULT,"End of list.  User $0 is ahead by $1 points!", "sd"),
+  msg(QM_FEATOFSTRENGTHUNLOCKED,"FEAT OF STRENGTH: $0", "s"),
+  msg(QM_ACHCHANNELHEADER,"Achievement points for users on $0:\n  #  Nick            Username        Points","s"),
+  msg(QM_TITLEUNLOCKED,"TITLE UNLOCKED: $0", "s"),
+  msg(QM_NOTITLES,"You have not unlocked any titles.",""),
+  msg(QM_TITLEHEADER,"Available titles:\n  #  Title",""),
+  msg(QM_INVALIDTITLE,"Invalid title ID.",""),
+  msg(QM_TITLETOOFAST,"You have already changed your title recently.  Please wait a while and try again.",""),
+  msg(QM_INACTIVEACCOUNT,"This account has not yet been activated.",""),
+  msg(QM_PWTOLONG, "Sorry, but new password is too long (maximum length 10 chars)", ""),
 } 
 EndMessages()
 #endif