Merge branch 'update_in_game_text' into 'master'

Update in-game text and also English and Japanese localization (CMC -> mana value and etc.)

See merge request core-developers/forge!4581

forge-gui/res/languages/en-US.properties

@@ -431,7 +431,7 @@ lblCommanderDesc=Each player has a legendary "General" card which can be cast at
 lblOathbreaker=Oathbreaker
 lblOathbreakerDesc=Each player has a Planeswalker card as their "Oathbreaker" which can be cast at any time and determines deck colors. Each player also has a signature spell that can be cast when their Oathbreaker is on the battlefield.
 lblTinyLeaders=Tiny Leaders
-lblTinyLeadersDesc=Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Each card must have CMC less than 4.
+lblTinyLeadersDesc=Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Each card must have mana value less than 4.
 lblBrawl=Brawl
 lblBrawlDesc=Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Only cards legal in Standard may be used.
 lblPlaneswalker=Planeswalker
@@ -779,13 +779,13 @@ lblEnchantments=Enchantments
 lblPlaneswalkers=Planeswalkers
 lblInstants=Instants
 lblSorceries=Sorceries
-lblCCMC0=Cards with CMC 0
-lblCCMC1=Cards with CMC 1
-lblCCMC2=Cards with CMC 2
-lblCCMC3=Cards with CMC 3
-lblCCMC4=Cards with CMC 4
-lblCCMC5=Cards with CMC 5
-lblCCMC6orMore=Cards with CMC 6+
+lblCCMC0=Cards with mana value 0
+lblCCMC1=Cards with mana value 1
+lblCCMC2=Cards with mana value 2
+lblCCMC3=Cards with mana value 3
+lblCCMC4=Cards with mana value 4
+lblCCMC5=Cards with mana value 5
+lblCCMC6orMore=Cards with mana value 6+
 lblWhitedecks=White decks
 lblBluedecks=Blue decks
 lblBlackdecks=Black decks
@@ -895,7 +895,7 @@ lblQuestWorld=Quest World
 lblSets=Sets
 lblTypes=Types
 lblConvertedManaCosts=Converted mana
-lblCMCRange=CMC Range
+lblCMCRange=Mana Value Range
 lblPowerRange=Power Range
 lblToughnessRange=Toughness Range
 lblFoil=Foil
@@ -919,8 +919,8 @@ lblPrompt=Prompt
 lblGameSetup=Game Setup
 #ColumnDef.java
 lblAIStatus=AI Status
-lblCMC=CMC
-ttCMC=CMC
+lblCMC=Mana Value
+ttCMC=Mana Value
 lblCN=CN
 ttCN=Collector Number Order
 ttColor=Color
@@ -2139,12 +2139,12 @@ lblSubtype=Subtype
 lblGenericCost=Generic Cost
 lblManaCost=Mana Cost
 lblFirstPrinting=First Printing
-lblAverageCMC=Average CMC
+lblAverageCMC=Average Mana Value
 lblMainDeck=Main Deck
 lblMainDeckSize=Main Deck Size
 lblSideboardSize=Sideboard Size
 lblOrigin=Origin
-lblDeckAverageCMC=Deck Average CMC
+lblDeckAverageCMC=Deck Average Mana Value
 lblDeckContents=Deck Contents
 lblDeckSize=Deck Size
 lblBuyPrice=Buy Price
@@ -2475,8 +2475,8 @@ lblRemainingDraws=REMAINING DRAWS
 lblTotalCards=Total cards
 lblTotalManaCost=Total mana cost
 lblAverageManaCost=Average mana cost
-lblCardByColorTypeCMC=CARDS BY COLOR, TYPE AND CMC:
-lblBreakdownOfColorTypeCMC=Breakdown of cards by color, type and CMC
+lblCardByColorTypeCMC=CARDS BY COLOR, TYPE AND MANA VALUE:
+lblBreakdownOfColorTypeCMC=Breakdown of cards by color, type and mana value
 lblColoredManaSymbolsINManaCost=COLORED MANA SYMBOLS IN MANA COST:
 lblAmountOfManaSymbolsInManaCostOfCards=Amount of mana symbols in mana cost of cards
 lblMulticolorCardCount=Multicolor Card Count
@@ -2498,7 +2498,7 @@ lblInstantCardCount=Instant Card Count
 lblLandCardCount=Land Card Count
 lblPlaneswalkerCardCount=Planeswalker Card Count
 lblSorceryCardCount=Sorcery Card Count
-lblCMCNCardCount=CMC {0} Card Count
+lblCMCNCardCount=Mana Value {0} Card Count
 #FFileChooser.java
 lblNewFolder=New Folder
 lblInvalidFolder=Invalid Folder

forge-gui/res/languages/ja-JP.properties

@@ -778,13 +778,13 @@ lblEnchantments=エンチャントのみ表示
 lblPlaneswalkers=プレインズウォーカーのみ表示
 lblInstants=インスタントのみ表示
 lblSorceries=ソーサリーのみ表示
-lblCCMC0=CMC 0のカードのみ表示
-lblCCMC1=CMC 1のカードのみ表示
-lblCCMC2=CMC 2のカードのみ表示
-lblCCMC3=CMC 3のカードのみ表示
-lblCCMC4=CMC 4のカードのみ表示
-lblCCMC5=CMC 5のカードのみ表示
-lblCCMC6orMore=CMC 6以上のカードのみ表示
+lblCCMC0=マナ総量 0のカードのみ表示
+lblCCMC1=マナ総量 1のカードのみ表示
+lblCCMC2=マナ総量 2のカードのみ表示
+lblCCMC3=マナ総量 3のカードのみ表示
+lblCCMC4=マナ総量 4のカードのみ表示
+lblCCMC5=マナ総量 5のカードのみ表示
+lblCCMC6orMore=マナ総量 6以上のカードのみ表示
 lblWhitedecks=白デッキ
 lblBluedecks=青デッキ
 lblBlackdecks=黒デッキ
@@ -918,8 +918,8 @@ lblPrompt=プロンプト
 lblGameSetup=ゲームのセットアップ
 #ColumnDef.java
 lblAIStatus=AIステータス
-lblCMC=CMC
-ttCMC=CMC
+lblCMC=マナ総量
+ttCMC=マナ総量
 lblCN=CN
 ttCN=コレクター番号順
 ttColor=色

forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java

@@ -210,7 +210,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
                     soFar += card.getCMC();
                 }
                 if (soFar > maxTotalCMC) {
-                    showMessage(sa.getHostCard() + " - Cannot target this card (CMC limit exceeded)");
+                    showMessage(sa.getHostCard() + " - Cannot target this card (mana value limit exceeded)");
                     return false;
                 }
             }
@@ -260,7 +260,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             }
         }
 
-        // If all cards must have different CMC
+        // If all cards must have different mana values
         if (tgt.isDifferentCMC()) {
             final List<Integer> targetedCMCs = new ArrayList<>();
             for (final GameObject o : targetDepth.keySet()) {
@@ -270,7 +270,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
                 }
             }
             if (targetedCMCs.contains(card.getCMC())) {
-                showMessage(sa.getHostCard() + " - Cannot target this card (must have different CMC)");
+                showMessage(sa.getHostCard() + " - Cannot target this card (must have different mana values)");
                 return false;
             }
         }

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java

@@ -280,10 +280,10 @@ public class ConquestUtil {
         RARE     (FSkinProp.IMG_PW_BADGE_RARE, new RarityFilter(EnumSet.of(CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)), "Rare"),
         MYTHIC   (FSkinProp.IMG_PW_BADGE_MYTHIC, new RarityFilter(EnumSet.of(CardRarity.MythicRare)), "Mythic Rare (100%)"),
 
-        CMC_LOW      (FSkinProp.IMG_CMC_LOW, new CMCFilter(0, 3), "CMC 0-3"),
-        CMC_LOW_MID  (FSkinProp.IMG_CMC_LOW_MID, new CMCFilter(2, 5), "CMC 2-5"),
-        CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, new CMCFilter(4, 7), "CMC 4-7"),
-        CMC_HIGH     (FSkinProp.IMG_CMC_HIGH, new CMCFilter(6, -1), "CMC 6+");
+        CMC_LOW      (FSkinProp.IMG_CMC_LOW, new CMCFilter(0, 3), "Mana Value 0-3"),
+        CMC_LOW_MID  (FSkinProp.IMG_CMC_LOW_MID, new CMCFilter(2, 5), "Mana Value 2-5"),
+        CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, new CMCFilter(4, 7), "Mana Value 4-7"),
+        CMC_HIGH     (FSkinProp.IMG_CMC_HIGH, new CMCFilter(6, -1), "Mana Value 6+");
 
         private final FSkinProp skinProp;
         private final Predicate<PaperCard> predicate;