- Big catchup commit to make sure we are up to beta7.

This includes a number of single patches, ranging from the vista fix with the buffers, to the start of many new minor features.

gui/Scyther/Claim.py

@@ -6,9 +6,9 @@ import Term
 
 def stateDescription(okay,n=1,caps=False):
     if okay:
-        s = "trace class"
+        s = "trace pattern"
         if n != 1:
-            s += "es"
+            s += "s"
     else:
         s = "attack"
         if n != 1: