diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
index 59fcb99ce2..1b84aa1c7b 100644
--- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
+++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
@@ -466,50 +466,50 @@ public class CallbackClientImpl implements CallbackClient {
switch (usedPanel.getChatType()) {
case GAME:
usedPanel.receiveMessage("", new StringBuilder()
- .append("HOTKEYS:")
- .append("
Turn mousewheel up (ALT-e) - enlarge image of card the mousepointer hovers over")
- .append("
Turn mousewheel down (ALT-s) - enlarge original/alternate image of card the mousepointer hovers over")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CONFIRM)))
- .append(" - Confirm \"Ok\", \"Yes\" or \"Done\" button")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_NEXT_TURN)))
- .append(" - Skip current turn but stop on declare attackers/blockers and something on the stack")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_END_STEP)))
- .append(" - Skip to next end step but stop on declare attackers/blockers and something on the stack")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SKIP_STEP)))
- .append(" - Skip current turn but stop on declare attackers/blockers")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_MAIN_STEP)))
- .append(" - Skip to next main phase but stop on declare attackers/blockers and something on the stack")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_YOUR_TURN)))
- .append(" - Skip everything until your next turn")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_PRIOR_END)))
- .append(" - Skip everything until the end step just prior to your turn")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CANCEL_SKIP)))
- .append(" - Undo F4/F5/F7/F9/F11")
- .append("
")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SWITCH_CHAT)))
- .append(" - Switch in/out to chat text field")
- /*
+ .append("HOTKEYS:")
+ .append("
Turn mousewheel up (ALT-e) - enlarge image of card the mousepointer hovers over")
+ .append("
Turn mousewheel down (ALT-s) - enlarge original/alternate image of card the mousepointer hovers over")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CONFIRM)))
+ .append(" - Confirm \"Ok\", \"Yes\" or \"Done\" button")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_NEXT_TURN)))
+ .append(" - Skip current turn but stop on declare attackers/blockers and something on the stack")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_END_STEP)))
+ .append(" - Skip to next end step but stop on declare attackers/blockers and something on the stack")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SKIP_STEP)))
+ .append(" - Skip current turn but stop on declare attackers/blockers")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_MAIN_STEP)))
+ .append(" - Skip to next main phase but stop on declare attackers/blockers and something on the stack")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_YOUR_TURN)))
+ .append(" - Skip everything until your next turn")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_PRIOR_END)))
+ .append(" - Skip everything until the end step just prior to your turn")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CANCEL_SKIP)))
+ .append(" - Undo F4/F5/F7/F9/F11")
+ .append("
")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SWITCH_CHAT)))
+ .append(" - Switch in/out to chat text field")
+ /*
.append("
")
.append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_TOGGLE_MACRO)))
.append(" - Toggle recording a sequence of actions to repeat. Will not pause if interrupted and can fail if a selected card changes such as when scrying top card to bottom.")
.append("
").append(System.getProperty("os.name").contains("Mac OS X") ? "Cmd" : "Ctrl").append(" + click - Hold priority while casting a spell or activating an ability")
- */
- .append("
")
- .append("
")
- .append("CHAT COMMANDS:")
- .append("
").append("/h username - show player's stats (history)")
- .append("
").append("/w username message - send private message to player (whisper)")
- .append("
").append("/pings - show players and watchers ping")
- .append("
").append("/fix - fix freezed game")
- .toString(),
+ */
+ .append("
")
+ .append("
")
+ .append("CHAT COMMANDS:")
+ .append("
").append("/h username - show player's stats (history)")
+ .append("
").append("/w username message - send private message to player (whisper)")
+ .append("
").append("/pings - show players and watchers ping")
+ .append("
").append("/fix - fix frozen game")
+ .toString(),
null, null, MessageType.USER_INFO, ChatMessage.MessageColor.BLUE);
break;
case TOURNAMENT:
@@ -519,10 +519,10 @@ public class CallbackClientImpl implements CallbackClient {
case TABLES:
String serverAddress = SessionHandler.getSession().getServerHostname().orElse("");
usedPanel.receiveMessage("", new StringBuilder("Download card images by using the \"Images\" main menu.")
- .append("
Download icons and symbols by using the \"Symbols\" main menu.")
- .append("
\\list - show a list of available chat commands.")
- .append("
").append(IgnoreList.usage(serverAddress))
- .append("
Type \\w yourUserName profanity 0 (or 1 or 2) to turn off/on the profanity filter").toString(),
+ .append("
Download icons and symbols by using the \"Symbols\" main menu.")
+ .append("
\\list - show a list of available chat commands.")
+ .append("
").append(IgnoreList.usage(serverAddress))
+ .append("
Type \\w yourUserName profanity 0 (or 1 or 2) to turn off/on the profanity filter").toString(),
null, null, MessageType.USER_INFO, ChatMessage.MessageColor.BLUE);
break;
default:
@@ -628,7 +628,7 @@ public class CallbackClientImpl implements CallbackClient {
logger.fatal("Client error\n", ex);
String errorMessage = ex.getMessage();
if (errorMessage == null || errorMessage.isEmpty() || errorMessage.equals("Null")) {
- errorMessage = ex.getClass().getSimpleName() + " - look server or client logs for more details";
+ errorMessage = ex.getClass().getSimpleName() + " - look at server or client logs for more details";
}
frame.showError("Server's error: " + errorMessage);
}