summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-20 06:29:29 +0000
committerrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-20 06:29:29 +0000
commit5b3eb75157915ee67086f4b577f41dad11c56964 (patch)
tree752e8e8d45ce108c3298f7f4f2782d2dbd4ebc74
parente02f698fba251a63ab59978534eddc56eb015665 (diff)
BUILD : 1.7.17 (1191) BUGS : 616 NOTES : Error message changed when trying to register a nick before NSRegDelay is up.
git-svn-id: svn://svn.anope.org/anope/trunk@1191 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@911 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--lang/en_us.l2
-rw-r--r--version.log7
3 files changed, 8 insertions, 2 deletions
diff --git a/Changes b/Changes
index b212bf21d..ba6e283c5 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Anope Version S V N
--------------------
10/17 F Encryption, users can now pick none, old, md5 or sha1. [ #00]
10/18 F MLock support for +c was missing on ultimate3. [ #00]
+10/20 F Error message when unable to register due to NSRegDelay. [#616]
Anope Version 1.7.17
--------------------
diff --git a/lang/en_us.l b/lang/en_us.l
index f53f73daa..80a5c4d5e 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -335,7 +335,7 @@ NICK_REGISTERED_NO_MASK
NICK_PASSWORD_IS
Your password is %s - remember this for later use.
NICK_REG_DELAY
- You have to be connected longer than %d seconds to register your nick.
+ You must have been using this nick for at least %d seconds to register.
# GROUP responses
NICK_GROUP_SYNTAX
diff --git a/version.log b/version.log
index f563aeb6f..15d624ed9 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="17"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1190"
+VERSION_BUILD="1191"
# $Log$
#
+# BUILD : 1.7.17 (1191)
+# BUGS : 616
+# NOTES : Error message changed when trying to register a nick before NSRegDelay is up.
+#
+#
# BUILD : 1.7.17 (1190)
# BUGS : N/A
# NOTES : sha1 is a valid choice of encryption hash