searching for changes

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

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index 9bd406b34d31ae97c96d87346567503322cca4a5..2e16ceeb396cf6999f6ee57da3b8247ec7b996b1 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -1,6 +1,8 @@
 #ifndef __CHANSERV_MESSAGES_H
 #define __CHANSERV_MESSAGES_H
 
+#define Q9_FORMAT_TIME "%d/%m/%y %H:%M"
+
 #define MAXMESSAGES  200
 
 #ifdef COMPILING_MESSAGES
@@ -89,10 +91,10 @@ BeginMessages() {
   msg(QM_WHOIS_INFO, "Info           : $0", "s"),
   msg(QM_WHOIS_COMMENT, "Staff comment  : $0", "s"),
   msg(QM_WHOIS_FLAGS, "User flags     : $0", "s"),
-  msg(QM_WHOIS_CREATED, "User created   : $0", "s"),
+  msg(QM_WHOIS_CREATED, "User created   : $0", "T"),
   msg(QM_WHOIS_CHANHEADER, "Known on the following channels:\nChannel                        Flags", ""),
   msg(QM_WHOIS_EMAIL, "Email address  : $0", "s"),
-  msg(QM_WHOIS_EMAILSET, "Email last set : $0", "s"),
+  msg(QM_WHOIS_EMAILSET, "Email last set : $0", "T"),
   msg(QM_COMMENT, "Staff comment for $0: $1.", "ss"),
   msg(QM_NOCOMMENT, "No staff comment for $0.", "s"),
   msg(QM_BADAUTH, "$0: Your account has been deleted or suspended.", "s"),
@@ -128,18 +130,18 @@ BeginMessages() {
   msg(QM_WHOIS_USERLANG, "Language       : $0", "s"),
   msg(QM_CHANTYPEIS, "Channel type for $0 is: $1", "ss"),
   msg(QM_STATSHEADER, "Statistics for $0:", "s"),
-  msg(QM_STATSADDED, "Date added: $0", "s"),
-  msg(QM_STATSJOINS, "Since $0: maximum size $1, $2 joins ($3 joins/day).", "sddg"),
-  msg(QM_STATSLASTACTIVE, "Last active: $0", "s"),
+  msg(QM_STATSADDED, "Date added: $0", "T"),
+  msg(QM_STATSJOINS, "Since $0: maximum size $1, $2 joins ($3 joins/day).", "Tddg"),
+  msg(QM_STATSLASTACTIVE, "Last active: $0", "T"),
   msg(QM_AUTHSUSPENDED, "Your Q account is suspended.", ""),
   msg(QM_REASON, "Reason: $0", "s"),
-  msg(QM_EXPIRES, "Expires: $0", "s"),
+  msg(QM_EXPIRES, "Expires: $0", "T"),
   msg(QM_TOOMANYAUTHS, "Too many users AUTH'd to this account.", ""),
   msg(QM_INVALIDDURATION, "Duration must be between 1d and 1M.", ""),
   msg(QM_DISCONNECTINGUSER, "Disconnecting $0 (authed as $1)", "ss"),
   msg(QM_USERALREADYSUSPENDED, "User is already suspended.", ""),
   msg(QM_USERNOTSUSPENDED, "User $0 is not suspended.", "s"),
-  msg(QM_SPEWHEADER, "Username:       Suspended: Email:                         Last user@host:", ""),
+  msg(QM_SPEWHEADER, "Username:       Suspended: Email:                         Last auth:      Last user@host:", ""),
   msg(QM_TOOMANYRESULTS, "Found over $0 $1, truncating list.", "ds"),
   msg(QM_RESULTCOUNT, "Found $0 $1$2.", "uss"),
   msg(QM_SUSPENDKILL, "Attention: Your Q account has been suspended. You are being disconnected.", ""),
@@ -174,12 +176,12 @@ BeginMessages() {
   msg(QM_WARNNOTREMOVEDPERMBAN, "Warning: not removing registered ban $0 from $1.", "ss"),
   msg(QM_MAXHELLOLIMIT, "Sorry, the registration service is unavailable to you at this time. Please try again later.", ""),
   msg(QM_ADDRESSLIMIT, "Too many accounts exist from this email address.", ""),
-  msg(QM_DOMAINBANNED, "That email address has been blocked.", ""),
+  msg(UNUSED_1, "", ""),
   msg(QM_TYPEHELPFORHELP, "For more information, type HELP $0.", "s"),
   msg(QM_REQUESTPASSPRIVUSER, "Cannot send password for that account.", ""),
   msg(QM_EMAILMATCHESOLD, "The new email address is the same as current one.", ""),
   msg(QM_INVALIDLIMIT, "Supplied autolimit is invalid: $0", "s"),
-  msg(QM_ACCOUNTLOCKED, "This account has recently been modified. It will be unlocked on $0.", "s"),
+  msg(QM_ACCOUNTLOCKED, "This account has recently been modified. It will be unlocked on $0.", "T"),
   msg(QM_ACCOUNTNOTLOCKED, "That account is not locked.", ""),
   msg(QM_RESETOK, "Your old account settings have been restored, please check your email.", ""),
   msg(QM_BADRESETCODE, "Bad reset code.", ""),
@@ -198,11 +200,21 @@ BeginMessages() {
   msg(QM_CHANLEVEMPTIEDCHANNEL, "The channel has been deleted since the last known user was removed.", ""),
   msg(QM_CHANLEVCHANGED, "Done.  Flags for $0 on $1 are now: $2.", "sss"),
   msg(QM_CHANLEVREMOVED, "Done.  User $0 is no longer known on $1.", "ss"),
-  msg(QM_CHANLEVNOCHANGE, "No change - check that you didn't specify an impossible flag combination.", ""),
+  msg(QM_CHANLEVNOCHANGE, "Nothing changed.  This could be because you specified an impossible flag combination or don't have enough access.", ""),
   msg(QM_USERSHEADER, "Users currently on $0:\nNick            Username        Flags        Host", "s"),
   msg(QM_EMPTYCHAN, "Channel $0 is currently empty.", "s"),
   msg(QM_USERSSUMMARY, "Total $0 users: $1 opped, $2 voiced, $3 others, $4 with flags ($5 ops, $6 masters)", "ddddddd"),
   msg(QM_OPERONCHAN, "You cannot use $0 on $1 since an oper is on the channel.","ss"),
+  msg(QM_USERSUSPENDEDTYPE,   "Suspend type   : $0", "s"),
+  msg(QM_USERSUSPENDEDBY,     "Suspended by   : $0", "s"),
+  msg(QM_USERSUSPENDEDREASON, "Suspend reason : $0", "s"),
+  msg(QM_USERSUSPENDEDAT,     "Suspended at   : $0", "T"),
+  msg(QM_USERSUSPENDEDEXPIRY, "Suspend expiry : $0", "s"),
+  msg(QM_INVALIDDOMAIN, "$0 is not a valid domain.", "s"),
+  msg(QM_SHORT_COMMENT, "Staff comment: $0", "s"),
+  msg(QM_CHANLEV_SUSPENDREASON, "Suspended: $0", "s"),
+  msg(QM_CHANLEV_SUSPENDSINCE, "Suspended since: $0", "T"),
+  msg(QM_CHANLEV_SUSPENDBY, "Suspended by: $0", "s"),
 } 
 EndMessages()
 #endif