From 7339eab35535196e3fba2676f16b36ac44d15cc4 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 25 Aug 2010 00:44:00 +0000
Subject: Merge branch 'master' into fully-bundled

---
(limited to 'bot/alice/C.aiml')

diff --git a/bot/alice/C.aiml b/bot/alice/C.aiml
index e448937..c2353b7 100644
--- a/bot/alice/C.aiml
+++ b/bot/alice/C.aiml
@@ -257,11 +257,6 @@
 </template>
 	</category>
 	<category>
-		<pattern>C EST CONTRE MA RELIGION</pattern>
-		<template>Votre religion est très restrictive, il me semble.
-</template>
-	</category>
-	<category>
 		<pattern>C EST COOL</pattern>
 		<template>Je suis heureux que vous l appréciez, <get name="name"/>.
 </template>
@@ -2416,11 +2411,6 @@
 </template>
 	</category>
 	<category>
-		<pattern>CALL ME JESUS CHRIST</pattern>
-		<template>Ambiguous: your name is Jesus or "call me, JC!"
-</template>
-	</category>
-	<category>
 		<pattern>CALL ME JUST *</pattern>
 		<template>
 			<srai>CALL ME <star/>
@@ -2575,19 +2565,6 @@ begin.
 </template>
 	</category>
 	<category>
-		<pattern>CAN GOD *</pattern>
-		<template>
-			Can you <star/>?
-		</template>
-	</category>
-	<category>
-		<pattern>CAN HE *</pattern>
-		<template>Perhaps he can do that.  How difficult is <set name="it">
-				<person/>
-			</set>?
-</template>
-	</category>
-	<category>
 		<pattern>CAN HUMANS *</pattern>
 		<template>
 			<srai>CAN I <star/>
@@ -6417,18 +6394,6 @@ and browse the free software downloads.
 		</template>
 	</category>
 	<category>
-		<pattern>CATHOLIC</pattern>
-		<template>
-			<srai>I AM CATHOLIC</srai>
-		</template>
-	</category>
-	<category>
-		<pattern>CATHOLIQUE</pattern>
-		<template>
-			<srai>JE SUIS CATHOLIQUE</srai>
-		</template>
-	</category>
-	<category>
 		<pattern>CATHY</pattern>
 		<that>WHAT CAN I CALL YOU</that>
 		<template>
@@ -7309,11 +7274,6 @@ and browse the free software downloads.
 		</template>
 	</category>
 	<category>
-		<pattern>CHRIST *</pattern>
-		<template>Jesus died for our sins.
-</template>
-	</category>
-	<category>
 		<pattern>CHRISTINA</pattern>
 		<that>WHAT CAN I CALL YOU</that>
 		<template>
@@ -7347,11 +7307,6 @@ and browse the free software downloads.
 		</template>
 	</category>
 	<category>
-		<pattern>CHURCH *</pattern>
-		<template>Educated people are often not very religious.
-</template>
-	</category>
-	<category>
 		<pattern>CIAO</pattern>
 		<template>Does CIAO mean hello or goodbye?
 </template>
@@ -11500,11 +11455,6 @@ conversations simultanées.
 		</template>
 	</category>
 	<category>
-		<pattern>CUNT</pattern>
-		<template>That kind of language will get you nowhere.
-</template>
-	</category>
-	<category>
 		<pattern>CURIEUX</pattern>
 		<template>
 			<srai>CURIEUX</srai>
--
cgit v0.9.1