lots of text fixes

Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java

@@ -226,7 +226,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
                 }
             }
             if (replaceRuleText && triggerPhrase != null) {
-                superRule = superRule.replaceFirst("^((?:you may )?sacrifice |put an? [^ ]+ counter on |return |transform )?\\{this\\}", "$1it");
+                superRule = superRule.replaceFirst("^((?:you may )?sacrifice |put an? [^ ]+ counter on |return |transform |untap )?\\{this\\}", "$1it");
             }
             sb.append(superRule);
             if (triggersOnceEachTurn) {

Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java

@@ -11,6 +11,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
 import mage.target.targetpointer.FixedTarget;
+import mage.util.CardUtil;
 
 public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
 
@@ -33,7 +34,7 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
         super(Zone.ALL, effect, optional);
         this.filter = filter;
         this.setTargetPointer = setTargetPointer;
-        setTriggerPhrase("Whenever a " + filter.getMessage() + " dealt damage by {this} this turn dies, ");
+        setTriggerPhrase(getWhen() + CardUtil.addArticle(filter.getMessage()) + " dealt damage by {this} this turn dies, ");
     }
 
     protected DealtDamageAndDiedTriggeredAbility(final DealtDamageAndDiedTriggeredAbility ability) {

Mage/src/main/java/mage/abilities/common/SpellCastControllerTriggeredAbility.java

@@ -103,7 +103,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
     }
 
     private void makeTriggerPhrase() {
-        String text = "Whenever you cast " + filter.getMessage();
+        String text = getWhen() + "you cast " + filter.getMessage();
 
         switch (fromZone) {
             case ALL:

Mage/src/main/java/mage/abilities/common/SpellCastOpponentTriggeredAbility.java

@@ -61,7 +61,7 @@ public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl {
         this.filter = filter;
         this.setTargetPointer = setTargetPointer;
         this.onlyFromNonHand = onlyFromNonHand;
-        setTriggerPhrase("Whenever an opponent casts "
+        setTriggerPhrase(getWhen() + "an opponent casts "
                 + filter.getMessage()
                 + (onlyFromNonHand ? " from anywhere other than their hand" : "")
                 + ", ");