14 files changed, 18 insertions, 13 deletions
diff --git a/Changes b/Changes
index 00b4b8c39..657a2d233 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Anope Version  S V N
 01/06 F Some OperServ commands not respecting OSOpersOnly when disabled.  [#657]
 01/06 F MySQL code not always reporting Services Root flags correctly.    [#659]
 01/10 F Minor syntax error in anoperc.                                    [#665]
+01/10 F CHAN_SYMBOL_REQUIRED claimed one can register local (&) channels. [#666]
 
 Anope Version 1.7.18
 --------------------
diff --git a/lang/cat.l b/lang/cat.l
index 89495a674..d6e4f1bd3 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1070,7 +1070,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/lang/de.l b/lang/de.l
index 7edacac66..2e9f11c8e 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1083,7 +1083,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	Du hast versucht ein nicht existierender Channel %s zu registrieren.
 CHAN_SYMBOL_REQUIRED
-	Verwende bitte nur das Symbol # oder & wenn du versuchst ein
+	Verwende bitte nur das Symbol # wenn du versuchst ein
 	Channel zu registrieren.
 
 # IDENTIFY responses
diff --git a/lang/en_us.l b/lang/en_us.l
index c308a2255..15730deaa 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1047,7 +1047,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/lang/es.l b/lang/es.l
index 3e3eaffb3..550238ab4 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1070,7 +1070,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	Has intentado registrar el canal %s, el cual no existe.
 CHAN_SYMBOL_REQUIRED
-	Por favor usar el simbolo # o & cuando intentes registrar un canal.
+	Por favor usar el simbolo # cuando intentes registrar un canal.
 
 
 # IDENTIFY responses
diff --git a/lang/fr.l b/lang/fr.l
index 61df533af..e6c79d68f 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1081,7 +1081,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	Vous avez essayé d'enregistrer le canal %s qui n'éxiste pas.
 CHAN_SYMBOL_REQUIRED
-	Veuillez utiliser les symbole # ou & quand vous voulez enregistrer
+	Veuillez utiliser les symbole # quand vous voulez enregistrer
 	un canal.
 	
 # IDENTIFY responses
diff --git a/lang/gr.l b/lang/gr.l
index d6ac42208..b6b6d3e7f 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1068,7 +1068,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/lang/hun.l b/lang/hun.l
index 0237252ca..ac742ad29 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1061,7 +1061,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY válaszok
diff --git a/lang/it.l b/lang/it.l
index 5539d42d9..bbb95c4d1 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1058,7 +1058,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	Hai provato a registrare un canale non esistente %s
 CHAN_SYMBOL_REQUIRED
-	Per favore usa il simbolo # o & provando a registrare
+	Per favore usa il simbolo # provando a registrare
 
 
 # IDENTIFY responses
diff --git a/lang/nl.l b/lang/nl.l
index 26478327a..a96469367 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1067,7 +1067,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	Je hebt geprobeerd om niet-bestaand kanaal %s te registeren.
 CHAN_SYMBOL_REQUIRED
-	Gebruik het # of & symbool wanner je probeert een kanaal te registeren.
+	Gebruik het # symbool wanner je probeert een kanaal te registeren.
 
 
 # IDENTIFY responses
diff --git a/lang/pl.l b/lang/pl.l
index 6fb5176b4..2a2ae6bae 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1145,7 +1145,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/lang/ru.l b/lang/ru.l
index 406fb0864..7175f0cdb 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1064,7 +1064,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/lang/tr.l b/lang/tr.l
index 22cda2477..b0c7478dd 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1075,7 +1075,7 @@ CHAN_PASSWORD_IS
 CHAN_REGISTER_NONE_CHANNEL
 	You have attempted to register a nonexistent channel %s
 CHAN_SYMBOL_REQUIRED
-	Please use the symbol of # or & when attempting to register
+	Please use the symbol of # when attempting to register
 
 
 # IDENTIFY responses
diff --git a/version.log b/version.log
index e50f1c4b1..405907d87 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="18"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1222"
+VERSION_BUILD="1223"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1223)
+# BUGS  : 666
+# NOTES : Fixed CHAN_SYMBOL_REQUIRED which claimed one can register local (&) channels (sorry Rob, i should have left this bug for you)
+#
 # BUILD : 1.7.18 (1222)
 # BUGS  : 665
 # NOTES : Fixed a minor syntax error in anoperc (echi instead of echo)