summaryrefslogtreecommitdiff
path: root/docs/Changes.lang
diff options
context:
space:
mode:
authorAdam <Adam@Anope.org>2010-05-24 23:36:40 -0500
committerAdam <Adam@anope.org>2010-06-18 21:04:05 -0400
commit2fba686904e6f78ebab35df171c5757afeebf05d (patch)
tree523782bccc479606206f271cd6708b2f70fe8278 /docs/Changes.lang
parent3a2c2a916a26f4fa1844e71a9f1c2fc25337fd2b (diff)
Burned slist, rewrote operservs XLine code
Diffstat (limited to 'docs/Changes.lang')
-rw-r--r--docs/Changes.lang53
1 files changed, 53 insertions, 0 deletions
diff --git a/docs/Changes.lang b/docs/Changes.lang
index 4289ba295..701d4fff4 100644
--- a/docs/Changes.lang
+++ b/docs/Changes.lang
@@ -12,6 +12,31 @@ Anope Version 1.9.3
NICK_MAIL_TEXT
NICK_SENDPASS
CHAN_LEVEL_FOUNDER
+ OPER_STATS_SNLINE_COUNT
+ OPER_STATS_SNLINE_EXPIRE_DAY
+ OPER_STATS_SNLINE_EXPIRE_HOURS
+ OPER_STATS_SNLINE_EXPIRE_MINS
+ OPER_STATS_SNLINE_EXPIRE_MIN
+ OPER_STATS_SNLINE_EXPIRE_NONE
+ OPER_SNLINE_SYNTAX
+ OPER_SNLINE_UNSUPPORTED
+ OPER_SNLINE_EXISTS
+ OPER_SNLINE_ALREADY_COVERED
+ OPER_SNLINE_REACHED_LIMIT
+ OPER_SNLINE_ADDED
+ OPER_SNLINE_CHANGED
+ OPER_SNLINE_NOT_FOUND
+ OPER_SNLINE_NO_MATCH
+ OPER_SNLINE_DELETED
+ OPER_SNLINE_DELETED_ONE
+ OPER_SNLINE_DELETED_SEVERAL
+ OPER_SNLINE_LIST_EMPTY
+ OPER_SNLINE_LIST_HEADER
+ OPER_SNLINE_LIST_FORMAT
+ OPER_SNLINE_VIEW_HEADER
+ OPER_SNLINE_CLEAR
+ OPER_HELP_CMD_SNLINE
+ OPER_HELP_SNLINE
*** Mod Strings:
NICK_GLIST_REPLY
@@ -34,6 +59,34 @@ Anope Version 1.9.3
NICK_SENDPASS_HEAD_3
NICK_SENDPASS_HEAD_4
NICK_SENDPASS_HEAD_5
+<<<<<<< HEAD
+ OPER_STATS_SGLINE_COUNT
+ OPER_STATS_SGLINE_EXPIRE_DAY
+ OPER_STATS_SGLINE_EXPIRE_HOURS
+ OPER_STATS_SGLINE_EXPIRE_MINS
+ OPER_STATS_SGLINE_EXPIRE_MIN
+ OPER_STATS_SGLINE_EXPIRE_NONE
+ OPER_SGLINE_SYNTAX
+ OPER_SGLINE_UNSUPPORTED
+ OPER_SGLINE_EXISTS
+ OPER_SGLINE_ALREADY_COVERED
+ OPER_SGLINE_REACHED_LIMIT
+ OPER_SGLINE_ADDED
+ OPER_SGLINE_CHANGED
+ OPER_SGLINE_NOT_FOUND
+ OPER_SGLINE_NO_MATCH
+ OPER_SGLINE_DELETED
+ OPER_SGLINE_DELETED_ONE
+ OPER_SGLINE_DELETED_SEVERAL
+ OPER_SGLINE_LIST_EMPTY
+ OPER_SGLINE_LIST_HEADER
+ OPER_SGLINE_LIST_FORMAT
+ OPER_SGLINE_VIEW_HEADER
+ OPER_SGLINE_CLEAR
+ OPER_HELP_CMD_SGLINE
+ OPER_HELP_SGLINE
+=======
+>>>>>>> 1.9.3-2
Anope Version 1.9.2
--------------------