followup text fixes

Mage/src/main/java/mage/Mana.java

@@ -676,7 +676,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
                 sbMana.append("{C}");
             }
         } else {
-            sbMana.append(colorless).append("{C}");
+            sbMana.append(CardUtil.numberToText(colorless)).append(" {C}");
         }
 
         String colorsInOrder = getColorsInOrder();

Mage/src/main/java/mage/abilities/abilityword/SurvivalAbility.java

@@ -24,7 +24,7 @@ public class SurvivalAbility extends TriggeredAbilityImpl {
     public SurvivalAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
         setTriggerPhrase("At the beginning of your second main phase, if {this} is tapped, ");
-        setAbilityWord(AbilityWord.SURVIVOR);
+        setAbilityWord(AbilityWord.SURVIVAL);
     }
 
     private SurvivalAbility(final SurvivalAbility ability) {

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

@@ -71,16 +71,20 @@ public class EntersBattlefieldOneOrMoreTriggeredAbility extends TriggeredAbility
     }
 
     private String generateTriggerPhrase() {
-        StringBuilder sb = new StringBuilder("Whenever one or more " + this.filterPermanent.getMessage());
+        StringBuilder sb = new StringBuilder("Whenever one or more " + filterPermanent.getMessage());
         switch (targetController) {
             case YOU:
-                sb.append(" you control enter, ");
+                if (filterPermanent.getMessage().contains("you control")) {
+                    sb.append(" enter, ");
+                } else {
+                    sb.append(" you control enter, ");
+                }
                 break;
             case OPPONENT:
                 sb.append(" enter under an opponent's control, ");
                 break;
             default:
-                throw new UnsupportedOperationException();
+                throw new IllegalArgumentException("Unsupported TargetController in EntersBattlefieldOneOrMoreTriggeredAbility");
         }
         return sb.toString();
     }

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

@@ -115,7 +115,7 @@ public class SacrificeOneOrMorePermanentsTriggeredAbility extends TriggeredAbili
                 targetControllerText = "an opponent sacrifices one or more ";
                 break;
             case ANY:
-                targetControllerText = "one or more players sacrifices one or more ";
+                targetControllerText = "one or more players sacrifice one or more ";
                 break;
             default:
                 throw new IllegalArgumentException("Unsupported TargetController in SacrificePermanentTriggeredAbility: " + sacrificingPlayer);

Mage/src/main/java/mage/abilities/dynamicvalue/common/EnergySpentOrLostThisTurnCount.java

@@ -21,11 +21,11 @@ public enum EnergySpentOrLostThisTurnCount implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "{E} spent or lost this turn";
+        return "{E} you've paid or lost this turn";
     }
 
     @Override
     public String toString() {
         return "X";
     }
-}
+}

Mage/src/main/java/mage/abilities/effects/common/PermanentsEnterBattlefieldTappedEffect.java

@@ -63,7 +63,7 @@ public class PermanentsEnterBattlefieldTappedEffect extends ReplacementEffectImp
             return staticText;
         }
         return filter.getMessage()
-                + " enter the battlefield tapped"
+                + " enter tapped"
                 + (duration == Duration.EndOfTurn ? " this turn" : "");
     }
 }

Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java

@@ -58,7 +58,7 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret
             sb.append(" counter");
         } else {
             sb.append(CardUtil.numberToText(counter.getCount()));
-            sb.append(additional ? " additional" : " ");
+            sb.append(additional ? " additional " : " ");
             sb.append(counter.getName());
             sb.append(" counters");
         }

Mage/src/main/java/mage/constants/AbilityWord.java

@@ -55,7 +55,7 @@ public enum AbilityWord {
     SECRET_COUNCIL("Secret council"),
     SPELL_MASTERY("Spell mastery"),
     STRIVE("Strive"),
-    SURVIVOR("Survivor"),
+    SURVIVAL("Survival"),
     SWEEP("Sweep"),
     TEMPTING_OFFER("Tempting offer"),
     THRESHOLD("Threshold"),

Mage/src/main/java/mage/game/permanent/token/TheEleventhHourToken.java

@@ -19,7 +19,7 @@ public final class TheEleventhHourToken extends TokenImpl {
     }
 
     public TheEleventhHourToken() {
-        super("Human Token", "1/1 white Human creature token with \"Doctor spells you cast cost 1 less to cast.\"");
+        super("Human Token", "1/1 white Human creature token with \"Doctor spells you cast cost {1} less to cast.\"");
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add(SubType.HUMAN);