From 6ac3852995c505ef9c6073e3ca3ed3979d0b7b1d Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Tue, 4 Jun 2019 23:33:36 +0200 Subject: [PATCH] grammar fixes (#3727) --- cockatrice/src/dlg_forgotpasswordreset.cpp | 2 +- cockatrice/src/shortcutssettings.h | 705 +++++++++++---------- cockatrice/src/tab_server.cpp | 6 +- cockatrice/src/user_context_menu.cpp | 4 +- cockatrice/src/window_main.cpp | 24 +- cockatrice/src/window_sets.cpp | 16 +- 6 files changed, 403 insertions(+), 354 deletions(-) diff --git a/cockatrice/src/dlg_forgotpasswordreset.cpp b/cockatrice/src/dlg_forgotpasswordreset.cpp index 85989452..a699cb4b 100644 --- a/cockatrice/src/dlg_forgotpasswordreset.cpp +++ b/cockatrice/src/dlg_forgotpasswordreset.cpp @@ -29,7 +29,7 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent if (settingsCache->servers().getFPHostname().isEmpty() && settingsCache->servers().getFPPort().isEmpty() && settingsCache->servers().getFPPlayerName().isEmpty()) { QMessageBox::warning(this, tr("Forgot Password Reset Warning"), - tr("Opps, looks like something has gone wrong. Please re-start the forgot password " + tr("Oops, looks like something has gone wrong. Please re-start the forgot password " "process by using the forgot password button on the connection screen.")); reject(); } diff --git a/cockatrice/src/shortcutssettings.h b/cockatrice/src/shortcutssettings.h index 6e8bfc50..e4e2415d 100644 --- a/cockatrice/src/shortcutssettings.h +++ b/cockatrice/src/shortcutssettings.h @@ -126,359 +126,408 @@ signals: private: const QChar sep = ';'; - const QString custom = "Custom"; + const QString custom = "Custom"; // name of custom group in shortCutsFile QString settingsFilePath; QHash shortCuts; QString stringifySequence(const QList &Sequence) const; QList parseSequenceString(const QString &stringSequence) const; - typedef ShortcutKey SK; const QHash defaultShortCuts = { - {"MainWindow/aCheckCardUpdates", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Check for card updates"), - parseSequenceString(""), + {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for card updates"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"MainWindow/aConnect", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Connect"), + parseSequenceString("Ctrl+L"), ShortcutGroup::Main_Window)}, - {"MainWindow/aConnect", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Connect"), parseSequenceString("Ctrl+L"), ShortcutGroup::Main_Window)}, - {"MainWindow/aDeckEditor", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Deck editor"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aDisconnect", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Disconnect"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aExit", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Exit"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aFullScreen", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Full screen"), - parseSequenceString("Ctrl+F"), - ShortcutGroup::Main_Window)}, - {"MainWindow/aRegister", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Register"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aSettings", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Settings"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aSinglePlayer", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Local gameplay"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"MainWindow/aWatchReplay", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Watch replay"), parseSequenceString(""), ShortcutGroup::Main_Window)}, - {"TabDeckEditor/aAnalyzeDeck", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Analyze deck"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aClearFilterAll", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Clear all filters"), - parseSequenceString(""), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aClearFilterOne", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Clear selected filter"), - parseSequenceString(""), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aClose", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Close"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aDecrement", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove card"), parseSequenceString("-"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aManageSets", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Manage sets"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aEditTokens", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Edit custom tokens"), - parseSequenceString(""), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aExportDeckDecklist", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Export deck"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aIncrement", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add card"), parseSequenceString("+"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aLoadDeck", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck"), parseSequenceString("Ctrl+O"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aLoadDeckFromClipboard", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck (clipboard)"), - parseSequenceString("Ctrl+Shift+V"), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aNewDeck", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "New deck"), parseSequenceString("Ctrl+N"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aOpenCustomFolder", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Open custom pic folder"), + {"MainWindow/aDeckEditor", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Deck editor"), parseSequenceString(""), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aPrintDeck", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Print deck"), - parseSequenceString("Ctrl+P"), - ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aRemoveCard", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Delete card"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aResetLayout", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Reset layout"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aSaveDeck", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck"), parseSequenceString("Ctrl+S"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aSaveDeckAs", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck as"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aSaveDeckToClipboard", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck (clipboard; annotated)"), - parseSequenceString("Ctrl+Shift+C"), + ShortcutGroup::Main_Window)}, + {"MainWindow/aDisconnect", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Disconnect"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"MainWindow/aExit", + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exit"), parseSequenceString(""), ShortcutGroup::Main_Window)}, + {"MainWindow/aFullScreen", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Full screen"), + parseSequenceString("Ctrl+F"), + ShortcutGroup::Main_Window)}, + {"MainWindow/aRegister", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Register"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"MainWindow/aSettings", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Settings"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"MainWindow/aSinglePlayer", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Start local game"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"MainWindow/aWatchReplay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Watch replay"), + parseSequenceString(""), + ShortcutGroup::Main_Window)}, + {"TabDeckEditor/aAnalyzeDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Analyze deck"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aClearFilterAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Clear all filters"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aClearFilterOne", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Clear selected filter"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aClose", + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Close"), parseSequenceString(""), ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aDecrement", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove card"), + parseSequenceString("-"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aManageSets", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Manage sets"), + parseSequenceString(""), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aSaveDeckToClipboardRaw", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck (clipboard, raw)"), - parseSequenceString("Ctrl+Shift+R"), - ShortcutGroup::Deck_Editor)}, - {"DeckViewContainer/loadLocalButton", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Load local deck"), - parseSequenceString("Ctrl+O"), - ShortcutGroup::Game_Lobby)}, - {"DeckViewContainer/loadRemoteButton", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Load remote deck"), - parseSequenceString("Ctrl+Alt+O"), - ShortcutGroup::Game_Lobby)}, - {"Player/aCCGreen", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add green counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aRCGreen", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove green counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aSCGreen", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set green counters"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aCCYellow", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add yellow counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aRCYellow", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove yellow counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aSCYellow", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set yellow counters"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aCCRed", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add red counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aRCRed", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove red counter"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aSCRed", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set red counters"), - parseSequenceString(""), - ShortcutGroup::Card_Counters)}, - {"Player/aInc", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add life counter"), - parseSequenceString("F12"), - ShortcutGroup::Player_Counters)}, - {"Player/aDec", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove life counter"), - parseSequenceString("F11"), - ShortcutGroup::Player_Counters)}, - {"Player/aSet", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set life counters"), - parseSequenceString("Ctrl+L"), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_w", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add white counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_w", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove white counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_w", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set white counters"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_u", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add blue counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_u", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove blue counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_u", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set blue counters"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_b", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add black counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_b", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove black counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_b", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set black counters"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_r", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add red counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_r", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove red counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_r", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set red counters"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_g", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add green counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_g", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove green counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_g", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set green counters"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_x", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add X counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_x", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove X counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_x", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set X counter"), - parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncCounter_storm", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add storm counter"), + {"TabDeckEditor/aEditTokens", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Edit custom tokens"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aExportDeckDecklist", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Export deck"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aIncrement", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add card"), + parseSequenceString("+"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aLoadDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck"), + parseSequenceString("Ctrl+O"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aLoadDeckFromClipboard", + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck from clipboard"), + parseSequenceString("Ctrl+Shift+V"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aNewDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "New deck"), + parseSequenceString("Ctrl+N"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aOpenCustomFolder", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Open custom pic folder"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aPrintDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Print deck"), + parseSequenceString("Ctrl+P"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aRemoveCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Delete card"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aResetLayout", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reset layout"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aSaveDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck"), + parseSequenceString("Ctrl+S"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aSaveDeckAs", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck as"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aSaveDeckToClipboard", + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck to clipboard annotated"), + parseSequenceString("Ctrl+Shift+C"), + ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aSaveDeckToClipboardRaw", + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Save deck to clipboard raw"), + parseSequenceString("Ctrl+Shift+R"), + ShortcutGroup::Deck_Editor)}, + {"DeckViewContainer/loadLocalButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load local deck"), + parseSequenceString("Ctrl+O"), + ShortcutGroup::Game_Lobby)}, + {"DeckViewContainer/loadRemoteButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load remote deck"), + parseSequenceString("Ctrl+Alt+O"), + ShortcutGroup::Game_Lobby)}, + {"Player/aCCGreen", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add green counter"), parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aDecCounter_storm", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove storm counter"), + ShortcutGroup::Card_Counters)}, + {"Player/aRCGreen", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove green counter"), parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aSetCounter_storm", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set storm counters"), + ShortcutGroup::Card_Counters)}, + {"Player/aSCGreen", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set green counters"), parseSequenceString(""), - ShortcutGroup::Player_Counters)}, - {"Player/aIncP", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add power (+1/+0)"), - parseSequenceString("Ctrl++"), - ShortcutGroup::Power_Toughness)}, - {"Player/aDecP", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove power (-1/-0)"), - parseSequenceString("Ctrl+-"), - ShortcutGroup::Power_Toughness)}, - {"Player/aFlowP", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Move to power (+1/-1)"), - parseSequenceString(""), - ShortcutGroup::Power_Toughness)}, - {"Player/aIncT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add toughness (+0/+1)"), - parseSequenceString("Alt++"), - ShortcutGroup::Power_Toughness)}, - {"Player/aDecT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove toughness (-0/-1)"), - parseSequenceString("Alt+-"), - ShortcutGroup::Power_Toughness)}, - {"Player/aFlowT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Move to toughness (-1/+1)"), - parseSequenceString(""), - ShortcutGroup::Power_Toughness)}, - {"Player/aIncPT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Add power and toughness (+1/+1)"), - parseSequenceString("Ctrl+Alt++"), - ShortcutGroup::Power_Toughness)}, - {"Player/aDecPT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove power and toughness (-1/-1)"), - parseSequenceString("Ctrl+Alt+-"), - ShortcutGroup::Power_Toughness)}, - {"Player/aSetPT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set power and toughness"), - parseSequenceString("Ctrl+P"), - ShortcutGroup::Power_Toughness)}, - {"Player/aResetPT", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Reset power and toughness"), - parseSequenceString("Ctrl+Alt+0"), - ShortcutGroup::Power_Toughness)}, - {"Player/phase0", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Untap"), parseSequenceString("F5"), ShortcutGroup::Game_Phases)}, + ShortcutGroup::Card_Counters)}, + {"Player/aCCYellow", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add yellow counter"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aRCYellow", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove yellow counter"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aSCYellow", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set yellow counters"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aCCRed", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add red counter"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aRCRed", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove red counter"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aSCRed", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set red counters"), + parseSequenceString(""), + ShortcutGroup::Card_Counters)}, + {"Player/aInc", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add life counter"), + parseSequenceString("F12"), + ShortcutGroup::Player_Counters)}, + {"Player/aDec", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove life counter"), + parseSequenceString("F11"), + ShortcutGroup::Player_Counters)}, + {"Player/aSet", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set life counters"), + parseSequenceString("Ctrl+L"), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_w", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add white counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_w", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove white counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_w", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set white counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_u", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add blue counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_u", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove blue counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_u", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set blue counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_b", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add black counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_b", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove black counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_b", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set black counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_r", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add red counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_r", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove red counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_r", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set red counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_g", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add green counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_g", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove green counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_g", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set green counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_x", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add colorless counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_x", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove colorless counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_x", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set colorless counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncCounter_storm", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add storm counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aDecCounter_storm", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove storm counter"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aSetCounter_storm", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set storm counters"), + parseSequenceString(""), + ShortcutGroup::Player_Counters)}, + {"Player/aIncP", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add power (+1/+0)"), + parseSequenceString("Ctrl++"), + ShortcutGroup::Power_Toughness)}, + {"Player/aDecP", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove power (-1/-0)"), + parseSequenceString("Ctrl+-"), + ShortcutGroup::Power_Toughness)}, + {"Player/aFlowP", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move toughness to power (+1/-1)"), + parseSequenceString(""), + ShortcutGroup::Power_Toughness)}, + {"Player/aIncT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add toughness (+0/+1)"), + parseSequenceString("Alt++"), + ShortcutGroup::Power_Toughness)}, + {"Player/aDecT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove toughness (-0/-1)"), + parseSequenceString("Alt+-"), + ShortcutGroup::Power_Toughness)}, + {"Player/aFlowT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move power to toughness (-1/+1)"), + parseSequenceString(""), + ShortcutGroup::Power_Toughness)}, + {"Player/aIncPT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add power and toughness (+1/+1)"), + parseSequenceString("Ctrl+Alt++"), + ShortcutGroup::Power_Toughness)}, + {"Player/aDecPT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove power and toughness (-1/-1)"), + parseSequenceString("Ctrl+Alt+-"), + ShortcutGroup::Power_Toughness)}, + {"Player/aSetPT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set power and toughness"), + parseSequenceString("Ctrl+P"), + ShortcutGroup::Power_Toughness)}, + {"Player/aResetPT", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reset power and toughness"), + parseSequenceString("Ctrl+Alt+0"), + ShortcutGroup::Power_Toughness)}, + {"Player/phase0", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Untap"), + parseSequenceString("F5"), + ShortcutGroup::Game_Phases)}, {"Player/phase1", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Upkeep"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Upkeep"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, {"Player/phase2", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Draw"), parseSequenceString("F6"), ShortcutGroup::Game_Phases)}, - {"Player/phase3", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Main 1"), parseSequenceString("F7"), ShortcutGroup::Game_Phases)}, - {"Player/phase4", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Start combat"), parseSequenceString("F8"), ShortcutGroup::Game_Phases)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw"), parseSequenceString("F6"), ShortcutGroup::Game_Phases)}, + {"Player/phase3", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "First main phase"), + parseSequenceString("F7"), + ShortcutGroup::Game_Phases)}, + {"Player/phase4", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Start combat"), + parseSequenceString("F8"), + ShortcutGroup::Game_Phases)}, {"Player/phase5", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Attack"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Attack"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, {"Player/phase6", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Block"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Block"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, {"Player/phase7", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Damage"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, - {"Player/phase8", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "End combat"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, - {"Player/phase9", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Main 2"), parseSequenceString("F9"), ShortcutGroup::Game_Phases)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Damage"), parseSequenceString(""), ShortcutGroup::Game_Phases)}, + {"Player/phase8", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "End combat"), + parseSequenceString(""), + ShortcutGroup::Game_Phases)}, + {"Player/phase9", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Second main phase"), + parseSequenceString("F9"), + ShortcutGroup::Game_Phases)}, {"Player/phase10", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "End"), parseSequenceString("F10"), ShortcutGroup::Game_Phases)}, - {"Player/aNextPhase", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Next phase"), - parseSequenceString("Ctrl+Space;Tab"), - ShortcutGroup::Game_Phases)}, - {"Player/aNextPhaseAction", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Next phase action"), - parseSequenceString("Shift+Tab"), - ShortcutGroup::Game_Phases)}, - {"Player/aNextTurn", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Next turn"), - parseSequenceString("Ctrl+Return;Ctrl+Enter"), - ShortcutGroup::Game_Phases)}, - {"Player/aTap", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Tap / Untap Card"), - parseSequenceString(""), - ShortcutGroup::Playing_Area)}, - {"Player/aUntapAll", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Untap all"), - parseSequenceString("Ctrl+U"), - ShortcutGroup::Playing_Area)}, - {"Player/aDoesntUntap", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle untap"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aFlip", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Flip card"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aPeek", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Peek card"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aPlay", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Play card"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aAttach", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Attach card"), - parseSequenceString("Ctrl+Alt+A"), - ShortcutGroup::Playing_Area)}, - {"Player/aUnattach", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Unattach card"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aClone", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Clone card"), - parseSequenceString("Ctrl+J"), - ShortcutGroup::Playing_Area)}, - {"Player/aCreateToken", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Create token"), - parseSequenceString("Ctrl+T"), - ShortcutGroup::Playing_Area)}, - {"Player/aCreateRelatedTokens", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Create all related tokens"), - parseSequenceString("Ctrl+Shift+T"), - ShortcutGroup::Playing_Area)}, - {"Player/aCreateAnotherToken", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Create another token"), - parseSequenceString("Ctrl+G"), - ShortcutGroup::Playing_Area)}, - {"Player/aSetAnnotation", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Set annotation"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, - {"Player/aMoveToBottomLibrary", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Bottom library"), - parseSequenceString(""), - ShortcutGroup::Move_selected)}, - {"Player/aMoveToExile", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_selected)}, - {"Player/aMoveToGraveyard", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), - parseSequenceString("Ctrl+Del"), - ShortcutGroup::Move_selected)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "End"), parseSequenceString("F10"), ShortcutGroup::Game_Phases)}, + {"Player/aNextPhase", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Next phase"), + parseSequenceString("Ctrl+Space;Tab"), + ShortcutGroup::Game_Phases)}, + {"Player/aNextPhaseAction", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Next phase action"), + parseSequenceString("Shift+Tab"), + ShortcutGroup::Game_Phases)}, + {"Player/aNextTurn", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Next turn"), + parseSequenceString("Ctrl+Return;Ctrl+Enter"), + ShortcutGroup::Game_Phases)}, + {"Player/aTap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Tap / Untap Card"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aUntapAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Untap all"), + parseSequenceString("Ctrl+U"), + ShortcutGroup::Playing_Area)}, + {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle untap"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn card over"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aPeek", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Peek card"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play card"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aAttach", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Attach card"), + parseSequenceString("Ctrl+Alt+A"), + ShortcutGroup::Playing_Area)}, + {"Player/aUnattach", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Unattach card"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aClone", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Clone card"), + parseSequenceString("Ctrl+J"), + ShortcutGroup::Playing_Area)}, + {"Player/aCreateToken", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Create token"), + parseSequenceString("Ctrl+T"), + ShortcutGroup::Playing_Area)}, + {"Player/aCreateRelatedTokens", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Create all related tokens"), + parseSequenceString("Ctrl+Shift+T"), + ShortcutGroup::Playing_Area)}, + {"Player/aCreateAnotherToken", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Create another token"), + parseSequenceString("Ctrl+G"), + ShortcutGroup::Playing_Area)}, + {"Player/aSetAnnotation", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set annotation"), + parseSequenceString(""), + ShortcutGroup::Playing_Area)}, + {"Player/aMoveToBottomLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Bottom library"), + parseSequenceString(""), + ShortcutGroup::Move_selected)}, + {"Player/aMoveToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), + parseSequenceString(""), + ShortcutGroup::Move_selected)}, + {"Player/aMoveToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), + parseSequenceString("Ctrl+Del"), + ShortcutGroup::Move_selected)}, {"Player/aMoveToHand", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::Move_selected)}, - {"Player/aMoveToTopLibrary", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Top library"), parseSequenceString(""), ShortcutGroup::Move_selected)}, - {"Player/aMoveTopToPlayFaceDown", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Play face down"), - parseSequenceString("Ctrl+Shift+E"), - ShortcutGroup::Move_selected)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::Move_selected)}, + {"Player/aMoveToTopLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of library"), + parseSequenceString(""), + ShortcutGroup::Move_selected)}, + {"Player/aMoveTopToPlayFaceDown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play face down"), + parseSequenceString("Ctrl+Shift+E"), + ShortcutGroup::Move_selected)}, {"Player/aViewHand", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)}, {"Player/aViewGraveyard", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), parseSequenceString("F4"), ShortcutGroup::View)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), parseSequenceString("F4"), ShortcutGroup::View)}, {"Player/aViewLibrary", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Library"), parseSequenceString("F3"), ShortcutGroup::View)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Library"), parseSequenceString("F3"), ShortcutGroup::View)}, {"Player/aViewRfg", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::View)}, - {"Player/aViewSideboard", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Sideboard"), parseSequenceString("Ctrl+F3"), ShortcutGroup::View)}, - {"Player/aViewTopCards", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Top cards of library"), - parseSequenceString("Ctrl+W"), - ShortcutGroup::View)}, - {"Player/aCloseMostRecentZoneView", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Close recent view"), parseSequenceString("Esc"), ShortcutGroup::View)}, - {"Player/aMoveTopCardToGraveyard", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard Once"), parseSequenceString(""), ShortcutGroup::Move_top)}, - {"Player/aMoveTopCardsToGraveyard", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard Multiple"), - parseSequenceString("Ctrl+Shift+M"), - ShortcutGroup::Move_top)}, - {"Player/aMoveTopCardToExile", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Exile Once"), parseSequenceString(""), ShortcutGroup::Move_top)}, - {"Player/aMoveTopCardsToExile", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Exile Multiple"), parseSequenceString(""), ShortcutGroup::Move_top)}, - {"Player/aDrawArrow", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Draw arrow"), parseSequenceString(""), ShortcutGroup::Gameplay)}, - {"Player/aRemoveLocalArrows", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Remove local arrows"), - parseSequenceString("Ctrl+R"), - ShortcutGroup::Gameplay)}, - {"Player/aLeaveGame", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Leave game"), parseSequenceString("Ctrl+Q"), ShortcutGroup::Gameplay)}, + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::View)}, + {"Player/aViewSideboard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sideboard"), + parseSequenceString("Ctrl+F3"), + ShortcutGroup::View)}, + {"Player/aViewTopCards", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top cards of library"), + parseSequenceString("Ctrl+W"), + ShortcutGroup::View)}, + {"Player/aCloseMostRecentZoneView", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Close recent view"), + parseSequenceString("Esc"), + ShortcutGroup::View)}, + {"Player/aMoveTopCardToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move to graveyard once"), + parseSequenceString(""), + ShortcutGroup::Move_top)}, + {"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move multiple to graveyard"), + parseSequenceString("Ctrl+Shift+M"), + ShortcutGroup::Move_top)}, + {"Player/aMoveTopCardToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move to exile once"), + parseSequenceString(""), + ShortcutGroup::Move_top)}, + {"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Move multiple to exile"), + parseSequenceString(""), + ShortcutGroup::Move_top)}, + {"Player/aDrawArrow", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw arrow"), + parseSequenceString(""), + ShortcutGroup::Gameplay)}, + {"Player/aRemoveLocalArrows", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Remove local arrows"), + parseSequenceString("Ctrl+R"), + ShortcutGroup::Gameplay)}, + {"Player/aLeaveGame", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Leave game"), + parseSequenceString("Ctrl+Q"), + ShortcutGroup::Gameplay)}, {"Player/aConcede", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Concede"), parseSequenceString("F2"), ShortcutGroup::Gameplay)}, - {"Player/aRollDie", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Roll dice"), parseSequenceString("Ctrl+I"), ShortcutGroup::Gameplay)}, - {"Player/aShuffle", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Shuffle library"), - parseSequenceString("Ctrl+S"), - ShortcutGroup::Gameplay)}, - {"Player/aMulligan", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan"), parseSequenceString("Ctrl+M"), ShortcutGroup::Drawing)}, - {"Player/aDrawCard", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Draw card"), parseSequenceString("Ctrl+D"), ShortcutGroup::Drawing)}, - {"Player/aDrawCards", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Draw cards"), parseSequenceString("Ctrl+E"), ShortcutGroup::Drawing)}, - {"Player/aUndoDraw", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Undo draw"), - parseSequenceString("Ctrl+Shift+D"), - ShortcutGroup::Drawing)}, - {"Player/aAlwaysRevealTopCard", SK(QT_TRANSLATE_NOOP("shortcutsTab", "Always reveal top card"), - parseSequenceString("Ctrl+N"), - ShortcutGroup::Drawing)}, - {"Player/aRotateViewCW", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate view CW"), parseSequenceString(""), ShortcutGroup::Drawing)}, - {"Player/aRotateViewCCW", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate view CCW"), parseSequenceString(""), ShortcutGroup::Drawing)}, - {"tab_room/aClearChat", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Clear chat"), parseSequenceString("F12"), ShortcutGroup::Chat_room)}, - {"Player/aResetLayout", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Reset layout"), parseSequenceString(""), ShortcutGroup::Game_window)}, - {"DlgLoadDeckFromClipboard/refreshButton", - SK(QT_TRANSLATE_NOOP("shortcutsTab", "Refresh"), parseSequenceString("F5"), ShortcutGroup::Load_deck)}}; + ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Concede"), parseSequenceString("F2"), ShortcutGroup::Gameplay)}, + {"Player/aRollDie", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Roll dice"), + parseSequenceString("Ctrl+I"), + ShortcutGroup::Gameplay)}, + {"Player/aShuffle", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Shuffle library"), + parseSequenceString("Ctrl+S"), + ShortcutGroup::Gameplay)}, + {"Player/aMulligan", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan"), + parseSequenceString("Ctrl+M"), + ShortcutGroup::Drawing)}, + {"Player/aDrawCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw a card"), + parseSequenceString("Ctrl+D"), + ShortcutGroup::Drawing)}, + {"Player/aDrawCards", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw multiple cards"), + parseSequenceString("Ctrl+E"), + ShortcutGroup::Drawing)}, + {"Player/aUndoDraw", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Undo draw"), + parseSequenceString("Ctrl+Shift+D"), + ShortcutGroup::Drawing)}, + {"Player/aAlwaysRevealTopCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Always reveal top card"), + parseSequenceString("Ctrl+N"), + ShortcutGroup::Drawing)}, + {"Player/aRotateViewCW", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate view clockwise"), + parseSequenceString(""), + ShortcutGroup::Drawing)}, + {"Player/aRotateViewCCW", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate view counterclockwise"), + parseSequenceString(""), + ShortcutGroup::Drawing)}, + {"tab_room/aClearChat", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Clear chat"), + parseSequenceString("F12"), + ShortcutGroup::Chat_room)}, + {"Player/aResetLayout", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reset layout"), + parseSequenceString(""), + ShortcutGroup::Game_window)}, + {"DlgLoadDeckFromClipboard/refreshButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Refresh"), + parseSequenceString("F5"), + ShortcutGroup::Load_deck)}}; }; #endif // SHORTCUTSSETTINGS_H diff --git a/cockatrice/src/tab_server.cpp b/cockatrice/src/tab_server.cpp index f92fd596..67a0c66f 100644 --- a/cockatrice/src/tab_server.cpp +++ b/cockatrice/src/tab_server.cpp @@ -206,12 +206,12 @@ void TabServer::joinRoomFinished(const Response &r, case Response::RespOk: break; case Response::RespNameNotFound: - QMessageBox::critical(this, tr("Error"), tr("Failed to join the room: it doesn't exists on the server.")); + QMessageBox::critical(this, tr("Error"), tr("Failed to join the room: it doesn't exist on the server.")); return; case Response::RespContextError: QMessageBox::critical(this, tr("Error"), - tr("The server thinks you are in the room but Cockatrice is unable to display it. " - "Try restarting Cockatrice.")); + tr("The server thinks you are in the room but your client is unable to display it. " + "Try restarting your client.")); return; case Response::RespUserLevelTooLow: QMessageBox::critical(this, tr("Error"), tr("You do not have the required permission to join this room.")); diff --git a/cockatrice/src/user_context_menu.cpp b/cockatrice/src/user_context_menu.cpp index 370e309d..e36a110b 100644 --- a/cockatrice/src/user_context_menu.cpp +++ b/cockatrice/src/user_context_menu.cpp @@ -181,7 +181,7 @@ void UserContextMenu::banUserHistory_processResponse(const Response &resp) } else QMessageBox::critical(static_cast(parent()), tr("Ban History"), - tr("Failed to collecting ban information.")); + tr("Failed to collect ban information.")); } void UserContextMenu::warnUserHistory_processResponse(const Response &resp) @@ -217,7 +217,7 @@ void UserContextMenu::warnUserHistory_processResponse(const Response &resp) } else QMessageBox::critical(static_cast(parent()), tr("Warning History"), - tr("Failed to collecting warning information.")); + tr("Failed to collect warning information.")); } void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const CommandContainer &commandContainer) diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 2de8227e..5879da12 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -410,14 +410,14 @@ void MainWindow::loginError(Response::ResponseCode r, case Response::RespClientIdRequired: QMessageBox::critical( this, tr("Error"), - tr("This server requires client ID's. Your client is either failing to generate an ID or you are " + tr("This server requires client IDs. Your client is either failing to generate an ID or you are " "running a modified client.\nPlease close and reopen your client to try again.")); break; case Response::RespContextError: QMessageBox::critical(this, tr("Error"), - tr("An internal error has occurred, please try closing and reopening your client and " - "try again. If the error persists try updating your client to the most recent " - "build and if need be contact your software provider.")); + tr("An internal error has occurred, please close and reopen Cockatrice before trying " + "again.\nIf the error persists, ensure you are running the latest version of the " + "software and if needed contact the software developers.")); break; case Response::RespAccountNotActivated: { bool ok = false; @@ -598,17 +598,17 @@ void MainWindow::setClientStatusTitle() case StatusRequestingForgotPassword: setWindowTitle( appName + " - " + - tr("Requesting forgot password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); break; case StatusSubmitForgotPasswordChallenge: setWindowTitle( appName + " - " + - tr("Requesting forgot password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); break; case StatusSubmitForgotPasswordReset: setWindowTitle( appName + " - " + - tr("Requesting forgot password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); break; default: setWindowTitle(appName); @@ -1030,10 +1030,10 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow QMessageBox msgBox; msgBox.setWindowTitle(tr("New sets found")); msgBox.setIcon(QMessageBox::Question); - msgBox.setText(tr("%1 new set(s) found in the card database\n" - "Set code(s): %2\n" - "Do you want to enable it/them?") - .arg(numUnknownSets) + msgBox.setText(tr("%n new set(s) found in the card database\n" + "Set code(s): %1\n" + "Do you want to enable it/them?", + "", numUnknownSets) .arg(unknownSetsNames.join(", "))); QPushButton *yesButton = msgBox.addButton(tr("Yes"), QMessageBox::YesRole); @@ -1313,7 +1313,7 @@ void MainWindow::forgotPasswordSuccess() { QMessageBox::information( this, tr("Forgot Password"), - tr("Your password has been reset successfully, you now may log in using the new credentials.")); + tr("Your password has been reset successfully, you can now log in using the new credentials.")); settingsCache->servers().setFPHostName(""); settingsCache->servers().setFPPort(""); settingsCache->servers().setFPPlayerName(""); diff --git a/cockatrice/src/window_sets.cpp b/cockatrice/src/window_sets.cpp index b463b0e3..933b0207 100644 --- a/cockatrice/src/window_sets.cpp +++ b/cockatrice/src/window_sets.cpp @@ -125,14 +125,14 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) labNotes->setWordWrap(true); labNotes->setTextInteractionFlags(Qt::TextBrowserInteraction); labNotes->setOpenExternalLinks(true); - labNotes->setText( - "" + tr("Deck Editor") + ": " + - tr("Only cards in enabled sets will appear in the deck editor card list") + "

" + "" + - tr("Card Art") + ": " + tr("Image priority is decided in the following order") + "
  1. " + tr("The") + - " " + - tr("CUSTOM Folder") + "
  2. " + tr("Enabled Sets (Top to Bottom)") + "
  3. " + - tr("Disabled Sets (Top to Bottom)") + "
"); + labNotes->setText("" + tr("Deck Editor") + ": " + + tr("Only cards in enabled sets will appear in the card list of the deck editor") + "

" + + "" + tr("Card Art") + ": " + tr("Image priority is decided in the following order") + + "
  1. " + tr("CUSTOM Folder") + + " (" + + tr("How to use custom card art") + ")
  2. " + tr("Enabled Sets (Top to Bottom)") + + "
  3. " + tr("Disabled Sets (Top to Bottom)") + "
"); QGridLayout *hintsGrid = new QGridLayout; hintsGrid->addWidget(labNotes, 0, 0);