- Somewhat better option name for auto-yield granularity.

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java

@@ -97,7 +97,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     private final FComboBoxPanel<CloseAction> cbpCloseAction = new FComboBoxPanel<>("Close Action:");
     private final FComboBoxPanel<String> cbpAiProfiles = new FComboBoxPanel<>("AI Personality:");
     private final FComboBoxPanel<String> cbpDisplayCurrentCardColors = new FComboBoxPanel<>("Show Detailed Card Color:");
-    private final FComboBoxPanel<String> cbpAutoYieldMode = new FComboBoxPanel<>("Auto-Yield Mode:");
+    private final FComboBoxPanel<String> cbpAutoYieldMode = new FComboBoxPanel<>("Auto-Yield:");
 
     /**
      * Constructor.
@@ -177,7 +177,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
         pnlPrefs.add(new NoteLabel("When enabled, preselects the last defined simultaneous ability order in the ordering dialog."), regularConstraints);
 
         pnlPrefs.add(cbpAutoYieldMode, regularConstraints);
-        pnlPrefs.add(new NoteLabel("Defines the granularity level of auto-yields (yield to each unique ability or to each unique card)."), regularConstraints);
+        pnlPrefs.add(new NoteLabel("Defines the granularity level of auto-yields (per unique ability or per unique card)."), regularConstraints);
 
         // Deck building options
         pnlPrefs.add(new SectionLabel("Random Deck Generation"), sectionConstraints);

forge-gui-mobile/src/forge/screens/settings/SettingsPage.java

@@ -127,7 +127,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                 "When enabled, preselects the last defined simultaneous ability order in the ordering dialog."),
                 1);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_AUTO_YIELD_MODE,
-                "Auto-Yield Mode",
+                "Auto-Yield",
                 "Defines the granularity level of auto-yields (yield to each unique ability or to each unique card).",
                 new String[]{ForgeConstants.AUTO_YIELD_PER_ABILITY, ForgeConstants.AUTO_YIELD_PER_CARD}), 
                 1);

forge-gui/CHANGES.txt

@@ -15,7 +15,7 @@ This release features all Aether Revolt cards that you can play with in all game
 This release features most Commander 2016 cards scripted and ready to play. The few remaining cards that are not currently supported may be scripted in the upcoming versions of Forge.
 
 - Auto-Yielding Granularity -
-It is now possible to specify the granularity level for auto-yields: it is possible to choose between yielding to each unique ability or to each unique card. The difference is that, for example, when yielding per ability if you auto-yield to Hellrider's triggered ability once, all triggers from other Hellrider cards will be automatically auto-yielded to as well. When yielding per card, you will need to auto-yield to each Hellrider separately. The historical Forge default of auto-yielding per ability has been restored, and the option can now be toggled in Forge Preferences (check out "Auto-Yield Mode" under Gameplay) in both Desktop and Mobile Forge.
+It is now possible to specify the granularity level for auto-yields: it is possible to choose between yielding to each unique ability or to each unique card. The difference is that, for example, when yielding per ability if you auto-yield to Hellrider's triggered ability once, all triggers from other Hellrider cards will be automatically auto-yielded to as well. When yielding per card, you will need to auto-yield to each Hellrider separately. The historical Forge default of auto-yielding per ability has been restored, and the option can now be toggled in Forge Preferences (check out "Auto-Yield" under Gameplay) in both Desktop and Mobile Forge.
 Note that in when auto-yielding per ability, auto-yields will NOT be automatically cleared between games in a match, which should speed the game up. When auto-yielding per card, auto-yields WILL be automatically cleared between games because they are dependent on card IDs which change from game to game, thus you will need to auto-yield to each card again in each game of the match.
 
 - User interface updates and changes -

forge-gui/src/main/java/forge/properties/ForgeConstants.java

@@ -195,6 +195,6 @@ public final class ForgeConstants {
     public static final String DISP_CURRENT_COLORS_NEVER = "Never";
 
     // Constants for Auto-Yield Mode
-    public static final String AUTO_YIELD_PER_CARD = "Per Card";
+    public static final String AUTO_YIELD_PER_CARD = "Per Card (Each Game)";
-    public static final String AUTO_YIELD_PER_ABILITY = "Per Ability";
+    public static final String AUTO_YIELD_PER_ABILITY = "Per Ability (Each Match)";
 }