diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index f8be8aca5..477e8cced 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,8 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/client/game_logic/abstract_client.cpp
-    src/client/game_logic/key_signals.cpp
     src/client/get_text_with_max.cpp
     src/client/menus/deck_editor/deck_editor_menu.cpp
     src/client/network/client_update_checker.cpp
@@ -201,6 +199,7 @@ set(cockatrice_SOURCES
     src/game/cards/exact_card.cpp
     src/game/deckview/deck_view.cpp
     src/game/deckview/deck_view_container.cpp
+    src/game/deckview/tabbed_deck_view_container.cpp
     src/game/filters/deck_filter_string.cpp
     src/game/filters/filter_builder.cpp
     src/game/filters/filter_card.cpp
@@ -226,6 +225,7 @@ set(cockatrice_SOURCES
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
     src/main.cpp
+    src/server/abstract_client.cpp
     src/server/chat_view/chat_view.cpp
     src/server/handle_public_servers.cpp
     src/server/local_client.cpp
@@ -256,6 +256,7 @@ set(cockatrice_SOURCES
     src/settings/shortcut_treeview.cpp
     src/settings/shortcuts_settings.cpp
     src/utility/card_info_comparator.cpp
+    src/utility/key_signals.cpp
     src/utility/levenshtein.cpp
     src/utility/logger.cpp
     src/utility/sequence_edit.cpp
diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
index b6908ce94..ce88a75c4 100644
--- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
@@ -1,6 +1,5 @@
 #include "abstract_tab_deck_editor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tapped_out_interface.h"
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../deck/deck_stats_interface.h"
@@ -9,6 +8,7 @@
 #include "../../dialogs/dlg_load_deck_from_website.h"
 #include "../../game/cards/card_database_manager.h"
 #include "../../game/cards/card_database_model.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
 #include "../ui/picture_loader/picture_loader.h"
@@ -549,6 +549,12 @@ void AbstractTabDeckEditor::filterTreeChanged(FilterTree *filterTree)
     databaseDisplayDockWidget->setFilterTree(filterTree);
 }
 
+void AbstractTabDeckEditor::closeEvent(QCloseEvent *event)
+{
+    emit deckEditorClosing(this);
+    event->accept();
+}
+
 // Method uses to sync docks state with menu items state
 bool AbstractTabDeckEditor::eventFilter(QObject *o, QEvent *e)
 {
@@ -592,12 +598,11 @@ bool AbstractTabDeckEditor::confirmClose()
     return true;
 }
 
-void AbstractTabDeckEditor::closeRequest(bool forced)
+bool AbstractTabDeckEditor::closeRequest()
 {
-    if (!forced && !confirmClose()) {
-        return;
+    if (!confirmClose()) {
+        return false;
     }
 
-    emit deckEditorClosing(this);
-    close();
+    return close();
 }
\ No newline at end of file
diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h
index 7b52ff3b6..dd85028dc 100644
--- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h
+++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h
@@ -78,7 +78,7 @@ public slots:
     void actDecrementCardFromSideboard(const ExactCard &card);
     void actOpenRecent(const QString &fileName);
     void filterTreeChanged(FilterTree *filterTree);
-    void closeRequest(bool forced = false) override;
+    bool closeRequest() override;
     virtual void showPrintingSelector() = 0;
     virtual void dockTopLevelChanged(bool topLevel) = 0;
 
@@ -117,6 +117,7 @@ protected slots:
     virtual void freeDocksSize() = 0;
     virtual void refreshShortcuts() = 0;
 
+    void closeEvent(QCloseEvent *event) override;
     bool eventFilter(QObject *o, QEvent *e) override;
     virtual void dockVisibleTriggered() = 0;
     virtual void dockFloatingTriggered() = 0;
diff --git a/cockatrice/src/client/tabs/tab.cpp b/cockatrice/src/client/tabs/tab.cpp
index dcc1ae0c2..8b098c280 100644
--- a/cockatrice/src/client/tabs/tab.cpp
+++ b/cockatrice/src/client/tabs/tab.cpp
@@ -43,16 +43,7 @@ void Tab::deleteCardInfoPopup(const QString &cardName)
     }
 }
 
-/**
- * Overrides the closeEvent in order to emit a close signal
- */
-void Tab::closeEvent(QCloseEvent *event)
+bool Tab::closeRequest()
 {
-    emit closed();
-    event->accept();
-}
-
-void Tab::closeRequest(bool /*forced*/)
-{
-    close();
+    return close();
 }
\ No newline at end of file
diff --git a/cockatrice/src/client/tabs/tab.h b/cockatrice/src/client/tabs/tab.h
index 68a1882a7..fc97585c3 100644
--- a/cockatrice/src/client/tabs/tab.h
+++ b/cockatrice/src/client/tabs/tab.h
@@ -15,12 +15,6 @@ class Tab : public QMainWindow
 signals:
     void userEvent(bool globalEvent = true);
     void tabTextChanged(Tab *tab, const QString &newTabText);
-    /**
-     * Emitted when the tab is closed (because Qt doesn't provide a built-in close signal)
-     * This signal is emitted from this class's overridden Tab::closeEvent method.
-     * Make sure any subclasses that override closeEvent still emit this signal from there.
-     */
-    void closed();
 
 protected:
     TabSupervisor *tabSupervisor;
@@ -31,7 +25,6 @@ protected:
 protected slots:
     void showCardInfoPopup(const QPoint &pos, const CardRef &cardRef);
     void deleteCardInfoPopup(const QString &cardName);
-    void closeEvent(QCloseEvent *event) override;
 
 private:
     CardRef currentCard;
@@ -59,13 +52,16 @@ public:
     }
     virtual QString getTabText() const = 0;
     virtual void retranslateUi() = 0;
+
     /**
-     * Sends a request to close the tab.
-     * Signals for cleanup should be emitted from this method instead of the destructor.
+     * Nicely asks to close the tab.
+     * Override this method to do checks or ask for confirmation before closing the tab.
+     * If you need to force close the tab, just call close() instead.
      *
-     * @param forced whether this close request was initiated by the user or forced by the server.
+     * @return True if the tab is successfully closed.
      */
-    virtual void closeRequest(bool forced = false);
+    virtual bool closeRequest();
+
     virtual void tabActivated()
     {
     }
diff --git a/cockatrice/src/client/tabs/tab_account.cpp b/cockatrice/src/client/tabs/tab_account.cpp
index 78517a82d..09261b63f 100644
--- a/cockatrice/src/client/tabs/tab_account.cpp
+++ b/cockatrice/src/client/tabs/tab_account.cpp
@@ -1,11 +1,11 @@
 #include "tab_account.h"
 
 #include "../../deck/custom_line_edit.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_info_box.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
-#include "../game_logic/abstract_client.h"
 #include "../sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_admin.cpp b/cockatrice/src/client/tabs/tab_admin.cpp
index 5a8ace0c6..3a46441bd 100644
--- a/cockatrice/src/client/tabs/tab_admin.cpp
+++ b/cockatrice/src/client/tabs/tab_admin.cpp
@@ -1,7 +1,7 @@
 #include "tab_admin.h"
 
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/admin_commands.pb.h"
 #include "pb/event_replay_added.pb.h"
 #include "pb/moderator_commands.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp
index 45762a76a..9908225d1 100644
--- a/cockatrice/src/client/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp
@@ -1,6 +1,5 @@
 #include "tab_deck_editor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tapped_out_interface.h"
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../dialogs/dlg_load_deck.h"
@@ -9,6 +8,7 @@
 #include "../../game/cards/card_database_model.h"
 #include "../../game/filters/filter_builder.h"
 #include "../../game/filters/filter_tree_model.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
 #include "../menus/deck_editor/deck_editor_menu.h"
diff --git a/cockatrice/src/client/tabs/tab_deck_editor.h b/cockatrice/src/client/tabs/tab_deck_editor.h
index 710689b8e..c5a7f5302 100644
--- a/cockatrice/src/client/tabs/tab_deck_editor.h
+++ b/cockatrice/src/client/tabs/tab_deck_editor.h
@@ -2,7 +2,7 @@
 #define WINDOW_DECKEDITOR_H
 
 #include "../../game/cards/card_info.h"
-#include "../game_logic/key_signals.h"
+#include "../../utility/key_signals.h"
 #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "abstract_tab_deck_editor.h"
 
diff --git a/cockatrice/src/client/tabs/tab_deck_storage.h b/cockatrice/src/client/tabs/tab_deck_storage.h
index e207a1187..45c6d9a82 100644
--- a/cockatrice/src/client/tabs/tab_deck_storage.h
+++ b/cockatrice/src/client/tabs/tab_deck_storage.h
@@ -1,8 +1,8 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
+#include "../../server/abstract_client.h"
 #include "../../server/remote/remote_decklist_tree_widget.h"
-#include "../game_logic/abstract_client.h"
 #include "tab.h"
 
 class ServerInfo_User;
diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index c4a119961..770ba2383 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -7,17 +7,18 @@
 #include "../../game/cards/card_database.h"
 #include "../../game/cards/card_database_manager.h"
 #include "../../game/deckview/deck_view_container.h"
+#include "../../game/deckview/tabbed_deck_view_container.h"
 #include "../../game/game_scene.h"
 #include "../../game/game_view.h"
 #include "../../game/player/player.h"
 #include "../../game/player/player_list_widget.h"
 #include "../../game/zones/card_zone.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/message_log_widget.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "../network/replay_timeline_widget.h"
 #include "../ui/line_edit_completer.h"
 #include "../ui/phases_toolbar.h"
@@ -261,6 +262,10 @@ void TabGame::retranslateUi()
         sayLabel->setText(tr("&Say:"));
     }
 
+    if (aCardMenu) {
+        aCardMenu->setText(tr("Selected cards"));
+    }
+
     viewMenu->setTitle(tr("&View"));
     cardInfoDockMenu->setTitle(tr("Card Info"));
     messageLayoutDockMenu->setTitle(tr("Messages"));
@@ -288,9 +293,9 @@ void TabGame::retranslateUi()
     QMapIterator<int, Player *> i(players);
     while (i.hasNext())
         i.next().value()->retranslateUi();
-    QMapIterator<int, DeckViewContainer *> j(deckViewContainers);
+    QMapIterator<int, TabbedDeckViewContainer *> j(deckViewContainers);
     while (j.hasNext())
-        j.next().value()->retranslateUi();
+        j.next().value()->playerDeckView->retranslateUi();
 
     scene->retranslateUi();
 }
@@ -376,15 +381,19 @@ void TabGame::refreshShortcuts()
     }
 }
 
-void TabGame::closeRequest(bool forced)
+bool TabGame::closeRequest()
 {
-    if (!forced && !leaveGame()) {
-        return;
+    if (!leaveGame()) {
+        return false;
     }
 
-    emit gameClosing(this);
+    return close();
+}
 
-    close();
+void TabGame::closeEvent(QCloseEvent *event)
+{
+    emit gameClosing(this);
+    event->accept();
 }
 
 void TabGame::incrementGameTime()
@@ -407,11 +416,6 @@ void TabGame::adminLockChanged(bool lock)
     sayEdit->setVisible(v);
 }
 
-bool TabGame::isSpectator()
-{
-    return spectator;
-}
-
 void TabGame::actGameInfo()
 {
     DlgCreateGame dlg(gameInfo, roomGameTypes, this);
@@ -561,7 +565,7 @@ void TabGame::actCompleterChanged()
 
 Player *TabGame::addPlayer(int playerId, const ServerInfo_User &info)
 {
-    bool local = ((clients.size() > 1) || (playerId == localPlayerId));
+    bool local = clients.size() > 1 || playerId == localPlayerId;
     auto *newPlayer = new Player(info, playerId, local, judge, this);
     connect(newPlayer, SIGNAL(openDeckEditor(const DeckLoader *)), this, SIGNAL(openDeckEditor(const DeckLoader *)));
     QString newPlayerName = "@" + newPlayer->getName();
@@ -572,14 +576,15 @@ Player *TabGame::addPlayer(int playerId, const ServerInfo_User &info)
     scene->addPlayer(newPlayer);
 
     connect(newPlayer, &Player::newCardAdded, this, &TabGame::newCardAdded);
+    connect(newPlayer, &Player::cardMenuUpdated, this, &TabGame::setCardMenu);
     messageLog->connectToPlayer(newPlayer);
 
     if (local && !spectator) {
         if (clients.size() == 1)
             newPlayer->setShortcutsActive();
 
-        auto *deckView = new DeckViewContainer(playerId, this);
-        connect(deckView, &DeckViewContainer::newCardAdded, this, &TabGame::newCardAdded);
+        auto *deckView = new TabbedDeckViewContainer(playerId, this);
+        connect(deckView->playerDeckView, &DeckViewContainer::newCardAdded, this, &TabGame::newCardAdded);
         deckViewContainers.insert(playerId, deckView);
         deckViewContainerLayout->addWidget(deckView);
 
@@ -587,8 +592,8 @@ Player *TabGame::addPlayer(int playerId, const ServerInfo_User &info)
         QString deckPath = SettingsCache::instance().debug().getDeckPathForPlayer(newPlayer->getName());
         if (!deckPath.isEmpty()) {
             QTimer::singleShot(0, this, [deckView, deckPath] {
-                deckView->loadDeckFromFile(deckPath);
-                deckView->readyAndUpdate();
+                deckView->playerDeckView->loadDeckFromFile(deckPath);
+                deckView->playerDeckView->readyAndUpdate();
             });
         }
     }
@@ -773,11 +778,11 @@ void TabGame::startGame(bool _resuming)
 {
     currentPhase = -1;
 
-    QMapIterator<int, DeckViewContainer *> i(deckViewContainers);
+    QMapIterator<int, TabbedDeckViewContainer *> i(deckViewContainers);
     while (i.hasNext()) {
         i.next();
-        i.value()->setReadyStart(false);
-        i.value()->setVisualDeckStorageExists(false);
+        i.value()->playerDeckView->setReadyStart(false);
+        i.value()->playerDeckView->setVisualDeckStorageExists(false);
         i.value()->hide();
     }
 
@@ -799,7 +804,7 @@ void TabGame::stopGame()
     currentPhase = -1;
     activePlayer = -1;
 
-    QMapIterator<int, DeckViewContainer *> i(deckViewContainers);
+    QMapIterator<int, TabbedDeckViewContainer *> i(deckViewContainers);
     while (i.hasNext()) {
         i.next();
         i.value()->show();
@@ -845,6 +850,9 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event,
                                     const GameEventContext & /*context*/)
 {
     const int playerListSize = event.player_list_size();
+
+    QVector<QPair<int, QPair<QString, QString>>> opponentDecksToDisplay;
+
     for (int i = 0; i < playerListSize; ++i) {
         const ServerInfo_Player &playerInfo = event.player_list(i);
         const ServerInfo_PlayerProperties &prop = playerInfo.properties();
@@ -867,16 +875,23 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event,
             }
             player->processPlayerInfo(playerInfo);
             if (player->getLocal()) {
-                DeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
+                TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
                 if (playerInfo.has_deck_list()) {
                     DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list()));
                     PictureLoader::cacheCardPixmaps(
                         CardDatabaseManager::getInstance()->getCards(newDeck.getCardRefList()));
-                    deckViewContainer->setDeck(newDeck);
+                    deckViewContainer->playerDeckView->setDeck(newDeck);
                     player->setDeck(newDeck);
                 }
-                deckViewContainer->setReadyStart(prop.ready_start());
-                deckViewContainer->setSideboardLocked(prop.sideboard_locked());
+                deckViewContainer->playerDeckView->setReadyStart(prop.ready_start());
+                deckViewContainer->playerDeckView->setSideboardLocked(prop.sideboard_locked());
+            } else {
+                if (!gameInfo.share_decklists_on_load()) {
+                    continue;
+                }
+
+                opponentDecksToDisplay.append(
+                    qMakePair(playerId, qMakePair(playerName, QString::fromStdString(playerInfo.deck_list()))));
             }
         }
     }
@@ -891,6 +906,21 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event,
         }
     }
 
+    for (const auto &entry : opponentDecksToDisplay) {
+        int playerId = entry.first;
+        QString playerName = entry.second.first;
+        QString deckList = entry.second.second;
+
+        DeckList loader;
+        loader.loadFromString_Native(deckList);
+
+        QMapIterator<int, TabbedDeckViewContainer *> it(deckViewContainers);
+        while (it.hasNext()) {
+            it.next();
+            it.value()->addOpponentDeckView(loader, playerId, playerName);
+        }
+    }
+
     secondsElapsed = event.seconds_elapsed();
 
     if (event.game_started() && !gameInfo.started()) {
@@ -922,7 +952,7 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
         case GameEventContext::READY_START: {
             bool ready = prop.ready_start();
             if (player->getLocal())
-                deckViewContainers.value(player->getId())->setReadyStart(ready);
+                deckViewContainers.value(player->getId())->playerDeckView->setReadyStart(ready);
             if (ready)
                 messageLog->logReadyStart(player);
             else
@@ -953,11 +983,20 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
             Context_DeckSelect deckSelect = context.GetExtension(Context_DeckSelect::ext);
             messageLog->logDeckSelect(player, QString::fromStdString(deckSelect.deck_hash()),
                                       deckSelect.sideboard_size());
+            if (gameInfo.share_decklists_on_load() && deckSelect.has_deck_list() && eventPlayerId != localPlayerId) {
+                DeckList loader;
+                loader.loadFromString_Native(QString::fromStdString(deckSelect.deck_list()));
+                QMapIterator<int, TabbedDeckViewContainer *> i(deckViewContainers);
+                while (i.hasNext()) {
+                    i.next();
+                    i.value()->addOpponentDeckView(loader, eventPlayerId, player->getName());
+                }
+            }
             break;
         }
         case GameEventContext::SET_SIDEBOARD_LOCK: {
             if (player->getLocal())
-                deckViewContainers.value(player->getId())->setSideboardLocked(prop.sideboard_locked());
+                deckViewContainers.value(player->getId())->playerDeckView->setSideboardLocked(prop.sideboard_locked());
             messageLog->logSetSideboardLock(player, prop.sideboard_locked());
             break;
         }
@@ -1209,22 +1248,21 @@ Player *TabGame::getActiveLocalPlayer() const
 void TabGame::setActiveCard(CardItem *card)
 {
     activeCard = card;
-    updateCardMenu(card);
 }
 
-void TabGame::updateCardMenu(AbstractCardItem *card)
+/**
+ * @param menu The menu to set. Pass in nullptr to set the menu to empty.
+ */
+void TabGame::setCardMenu(QMenu *menu)
 {
-    if (card == nullptr) {
+    if (!aCardMenu) {
         return;
     }
-    Player *player;
-    if ((clients.size() > 1) || !players.contains(localPlayerId)) {
-        player = card->getOwner();
+
+    if (menu) {
+        aCardMenu->setMenu(menu);
     } else {
-        player = players.value(localPlayerId);
-    }
-    if (player != nullptr) {
-        player->updateCardMenu(static_cast<CardItem *>(card));
+        aCardMenu->setMenu(new QMenu);
     }
 }
 
@@ -1249,7 +1287,7 @@ void TabGame::createMenuItems()
     aConcede = new QAction(this);
     connect(aConcede, &QAction::triggered, this, &TabGame::actConcede);
     aLeaveGame = new QAction(this);
-    connect(aLeaveGame, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
     aFocusChat = new QAction(this);
     connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus));
     aCloseReplay = nullptr;
@@ -1281,6 +1319,11 @@ void TabGame::createMenuItems()
     gameMenu->addAction(aConcede);
     gameMenu->addAction(aFocusChat);
     gameMenu->addAction(aLeaveGame);
+
+    gameMenu->addSeparator();
+
+    aCardMenu = gameMenu->addMenu(new QMenu(this));
+
     addTabMenu(gameMenu);
 }
 
@@ -1299,11 +1342,14 @@ void TabGame::createReplayMenuItems()
     aFocusChat = nullptr;
     aLeaveGame = nullptr;
     aCloseReplay = new QAction(this);
-    connect(aCloseReplay, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aCloseReplay, &QAction::triggered, this, &TabGame::closeRequest);
 
     phasesMenu = nullptr;
     gameMenu = new QMenu(this);
     gameMenu->addAction(aCloseReplay);
+
+    aCardMenu = nullptr;
+
     addTabMenu(gameMenu);
 }
 
diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h
index e00a76dc8..e7f69485c 100644
--- a/cockatrice/src/client/tabs/tab_game.h
+++ b/cockatrice/src/client/tabs/tab_game.h
@@ -13,6 +13,7 @@
 #include <QLoggingCategory>
 #include <QMap>
 
+class TabbedDeckViewContainer;
 inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");
 
 class UserListProxy;
@@ -105,7 +106,7 @@ private:
     PhasesToolbar *phasesToolbar;
     GameScene *scene;
     GameView *gameView;
-    QMap<int, DeckViewContainer *> deckViewContainers;
+    QMap<int, TabbedDeckViewContainer *> deckViewContainers;
     QVBoxLayout *deckViewContainerLayout;
     QWidget *gamePlayAreaWidget, *deckViewContainerWidget;
     QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock;
@@ -118,6 +119,7 @@ private:
         *aPlayerListDockVisible, *aPlayerListDockFloating, *aReplayDockVisible, *aReplayDockFloating;
     QAction *aFocusChat;
     QList<QAction *> phaseActions;
+    QAction *aCardMenu;
 
     Player *addPlayer(int playerId, const ServerInfo_User &info);
 
@@ -171,7 +173,7 @@ private slots:
     void incrementGameTime();
     void adminLockChanged(bool lock);
     void newCardAdded(AbstractCardItem *card);
-    void updateCardMenu(AbstractCardItem *card);
+    void setCardMenu(QMenu *menu);
 
     void actGameInfo();
     void actConcede();
@@ -202,6 +204,9 @@ private slots:
     void dockFloatingTriggered();
     void dockTopLevelChanged(bool topLevel);
 
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
 public:
     TabGame(TabSupervisor *_tabSupervisor,
             QList<AbstractClient *> &_clients,
@@ -212,7 +217,7 @@ public:
     ~TabGame() override;
     void retranslateUi() override;
     void updatePlayerListDockTitle();
-    void closeRequest(bool forced = false) override;
+    bool closeRequest() override;
     const QMap<int, Player *> &getPlayers() const
     {
         return players;
@@ -231,15 +236,14 @@ public:
         return gameInfo.game_id();
     }
     QString getTabText() const override;
-    bool getSpectator() const
+    bool isSpectator() const
     {
         return spectator;
     }
-    bool getSpectatorsSeeEverything() const
+    bool isSpectatorsOmniscient() const
     {
         return gameInfo.spectators_omniscient();
     }
-    bool isSpectator();
     Player *getActiveLocalPlayer() const;
     AbstractClient *getClientForPlayer(int playerId) const;
 
diff --git a/cockatrice/src/client/tabs/tab_logs.cpp b/cockatrice/src/client/tabs/tab_logs.cpp
index 0f75b4c74..cf289b2ed 100644
--- a/cockatrice/src/client/tabs/tab_logs.cpp
+++ b/cockatrice/src/client/tabs/tab_logs.cpp
@@ -2,8 +2,8 @@
 
 #include "../../deck/custom_line_edit.h"
 #include "../../dialogs/dlg_manage_sets.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_viewlog_history.pb.h"
 #include "trice_limits.h"
diff --git a/cockatrice/src/client/tabs/tab_message.cpp b/cockatrice/src/client/tabs/tab_message.cpp
index 9dc53156d..12b52528e 100644
--- a/cockatrice/src/client/tabs/tab_message.cpp
+++ b/cockatrice/src/client/tabs/tab_message.cpp
@@ -2,11 +2,11 @@
 
 #include "../../deck/custom_line_edit.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "../sound_engine.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/serverinfo_user.pb.h"
@@ -39,7 +39,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
     vbox->addWidget(sayEdit);
 
     aLeave = new QAction(this);
-    connect(aLeave, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeave, &QAction::triggered, this, &TabMessage::closeRequest);
 
     messageMenu = new QMenu(this);
     messageMenu->addAction(aLeave);
@@ -86,10 +86,10 @@ QString TabMessage::getTabText() const
     return tr("%1 - Private chat").arg(QString::fromStdString(otherUserInfo->name()));
 }
 
-void TabMessage::closeRequest(bool /*forced*/)
+void TabMessage::closeEvent(QCloseEvent *event)
 {
     emit talkClosing(this);
-    close();
+    event->accept();
 }
 
 void TabMessage::sendMessage()
diff --git a/cockatrice/src/client/tabs/tab_message.h b/cockatrice/src/client/tabs/tab_message.h
index dd7424e5d..659d0b804 100644
--- a/cockatrice/src/client/tabs/tab_message.h
+++ b/cockatrice/src/client/tabs/tab_message.h
@@ -37,6 +37,9 @@ private slots:
     void addMentionTag(QString mentionTag);
     void messageClicked();
 
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
 public:
     TabMessage(TabSupervisor *_tabSupervisor,
                AbstractClient *_client,
@@ -44,7 +47,6 @@ public:
                const ServerInfo_User &_otherUserInfo);
     ~TabMessage() override;
     void retranslateUi() override;
-    void closeRequest(bool forced = false) override;
     void tabActivated() override;
     QString getUserName() const;
     QString getTabText() const override;
diff --git a/cockatrice/src/client/tabs/tab_replays.cpp b/cockatrice/src/client/tabs/tab_replays.cpp
index 123c3d3fc..59f19a9c4 100644
--- a/cockatrice/src/client/tabs/tab_replays.cpp
+++ b/cockatrice/src/client/tabs/tab_replays.cpp
@@ -1,9 +1,9 @@
 #include "tab_replays.h"
 
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/remote/remote_replay_list_tree_widget.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/command_replay_delete_match.pb.h"
 #include "pb/command_replay_download.pb.h"
 #include "pb/command_replay_modify_match.pb.h"
@@ -29,6 +29,29 @@
 
 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
     : Tab(_tabSupervisor), client(_client)
+{
+    leftGroupBox = createLeftLayout();
+    rightGroupBox = createRightLayout();
+
+    // combine layouts
+    QHBoxLayout *hbox = new QHBoxLayout;
+    hbox->addWidget(leftGroupBox);
+    hbox->addWidget(rightGroupBox);
+
+    retranslateUi();
+
+    QWidget *mainWidget = new QWidget(this);
+    mainWidget->setLayout(hbox);
+    setCentralWidget(mainWidget);
+
+    connect(client, &AbstractClient::replayAddedEventReceived, this, &TabReplays::replayAddedEventReceived);
+
+    connect(client, &AbstractClient::userInfoChanged, this, &TabReplays::handleConnected);
+    connect(client, &AbstractClient::statusChanged, this, &TabReplays::handleConnectionChanged);
+    setRemoteEnabled(currentUserInfo && currentUserInfo->user_level() & ServerInfo_User::IsRegistered);
+}
+
+QGroupBox *TabReplays::createLeftLayout()
 {
     localDirModel = new QFileSystemModel(this);
     localDirModel->setRootPath(SettingsCache::instance().getReplaysPath());
@@ -52,46 +75,24 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     dummyToolBar->setSizePolicy(sizePolicy);
     dummyToolBar->setVisible(false);
 
-    leftToolBar = new QToolBar(this);
-    leftToolBar->setOrientation(Qt::Horizontal);
-    leftToolBar->setIconSize(QSize(32, 32));
+    QToolBar *toolBar = new QToolBar(this);
+    toolBar->setOrientation(Qt::Horizontal);
+    toolBar->setIconSize(QSize(32, 32));
 
-    QToolBar *leftRightmostToolBar = new QToolBar(this);
-    leftRightmostToolBar->setOrientation(Qt::Horizontal);
-    leftRightmostToolBar->setIconSize(QSize(32, 32));
+    QToolBar *rightmostToolBar = new QToolBar(this);
+    rightmostToolBar->setOrientation(Qt::Horizontal);
+    rightmostToolBar->setIconSize(QSize(32, 32));
 
-    QGridLayout *leftToolBarLayout = new QGridLayout;
-    leftToolBarLayout->addWidget(dummyToolBar, 0, 0, Qt::AlignLeft);
-    leftToolBarLayout->addWidget(leftToolBar, 0, 1, Qt::AlignHCenter);
-    leftToolBarLayout->addWidget(leftRightmostToolBar, 0, 2, Qt::AlignRight);
+    QGridLayout *toolBarLayout = new QGridLayout;
+    toolBarLayout->addWidget(dummyToolBar, 0, 0, Qt::AlignLeft);
+    toolBarLayout->addWidget(toolBar, 0, 1, Qt::AlignHCenter);
+    toolBarLayout->addWidget(rightmostToolBar, 0, 2, Qt::AlignRight);
 
-    QVBoxLayout *leftVbox = new QVBoxLayout;
-    leftVbox->addWidget(localDirView);
-    leftVbox->addLayout(leftToolBarLayout);
-    leftGroupBox = new QGroupBox;
-    leftGroupBox->setLayout(leftVbox);
-
-    // Right side layout
-    rightToolBar = new QToolBar;
-    rightToolBar->setOrientation(Qt::Horizontal);
-    rightToolBar->setIconSize(QSize(32, 32));
-    QHBoxLayout *rightToolBarLayout = new QHBoxLayout;
-    rightToolBarLayout->addStretch();
-    rightToolBarLayout->addWidget(rightToolBar);
-    rightToolBarLayout->addStretch();
-
-    serverDirView = new RemoteReplayList_TreeWidget(client);
-
-    QVBoxLayout *rightVbox = new QVBoxLayout;
-    rightVbox->addWidget(serverDirView);
-    rightVbox->addLayout(rightToolBarLayout);
-    rightGroupBox = new QGroupBox;
-    rightGroupBox->setLayout(rightVbox);
-
-    // combine layouts
-    QHBoxLayout *hbox = new QHBoxLayout;
-    hbox->addWidget(leftGroupBox);
-    hbox->addWidget(rightGroupBox);
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->addWidget(localDirView);
+    vbox->addLayout(toolBarLayout);
+    QGroupBox *groupBox = new QGroupBox;
+    groupBox->setLayout(vbox);
 
     // Left side actions
     aOpenLocalReplay = new QAction(this);
@@ -112,6 +113,36 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     aOpenReplaysFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_DirOpenIcon));
     connect(aOpenReplaysFolder, &QAction::triggered, this, &TabReplays::actOpenReplaysFolder);
 
+    // Add actions to toolbars
+    toolBar->addAction(aOpenLocalReplay);
+    toolBar->addAction(aRenameLocal);
+    toolBar->addAction(aNewLocalFolder);
+    toolBar->addAction(aDeleteLocalReplay);
+
+    rightmostToolBar->addAction(aOpenReplaysFolder);
+
+    return groupBox;
+}
+
+QGroupBox *TabReplays::createRightLayout()
+{
+    serverDirView = new RemoteReplayList_TreeWidget(client);
+
+    // Right side layout
+    QToolBar *toolBar = new QToolBar;
+    toolBar->setOrientation(Qt::Horizontal);
+    toolBar->setIconSize(QSize(32, 32));
+    QHBoxLayout *toolBarLayout = new QHBoxLayout;
+    toolBarLayout->addStretch();
+    toolBarLayout->addWidget(toolBar);
+    toolBarLayout->addStretch();
+
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->addWidget(serverDirView);
+    vbox->addLayout(toolBarLayout);
+    QGroupBox *groupBox = new QGroupBox;
+    groupBox->setLayout(vbox);
+
     // Right side actions
     aOpenRemoteReplay = new QAction(this);
     aOpenRemoteReplay->setIcon(QPixmap("theme:icons/view"));
@@ -128,29 +159,12 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay);
 
     // Add actions to toolbars
-    leftToolBar->addAction(aOpenLocalReplay);
-    leftToolBar->addAction(aRenameLocal);
-    leftToolBar->addAction(aNewLocalFolder);
-    leftToolBar->addAction(aDeleteLocalReplay);
+    toolBar->addAction(aOpenRemoteReplay);
+    toolBar->addAction(aDownload);
+    toolBar->addAction(aKeep);
+    toolBar->addAction(aDeleteRemoteReplay);
 
-    leftRightmostToolBar->addAction(aOpenReplaysFolder);
-
-    rightToolBar->addAction(aOpenRemoteReplay);
-    rightToolBar->addAction(aDownload);
-    rightToolBar->addAction(aKeep);
-    rightToolBar->addAction(aDeleteRemoteReplay);
-
-    retranslateUi();
-
-    QWidget *mainWidget = new QWidget(this);
-    mainWidget->setLayout(hbox);
-    setCentralWidget(mainWidget);
-
-    connect(client, &AbstractClient::replayAddedEventReceived, this, &TabReplays::replayAddedEventReceived);
-
-    connect(client, &AbstractClient::userInfoChanged, this, &TabReplays::handleConnected);
-    connect(client, &AbstractClient::statusChanged, this, &TabReplays::handleConnectionChanged);
-    setRemoteEnabled(currentUserInfo && currentUserInfo->user_level() & ServerInfo_User::IsRegistered);
+    return groupBox;
 }
 
 void TabReplays::retranslateUi()
diff --git a/cockatrice/src/client/tabs/tab_replays.h b/cockatrice/src/client/tabs/tab_replays.h
index 7014a7f6e..dafdcb5ae 100644
--- a/cockatrice/src/client/tabs/tab_replays.h
+++ b/cockatrice/src/client/tabs/tab_replays.h
@@ -1,7 +1,7 @@
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
-#include "../game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "tab.h"
 
 class ServerInfo_User;
@@ -23,7 +23,6 @@ private:
     AbstractClient *client;
     QTreeView *localDirView;
     QFileSystemModel *localDirModel;
-    QToolBar *leftToolBar, *rightToolBar;
     RemoteReplayList_TreeWidget *serverDirView;
     QGroupBox *leftGroupBox, *rightGroupBox;
 
@@ -31,6 +30,9 @@ private:
     QAction *aOpenReplaysFolder;
     QAction *aOpenRemoteReplay, *aDownload, *aKeep, *aDeleteRemoteReplay;
 
+    QGroupBox *createLeftLayout();
+    QGroupBox *createRightLayout();
+
     void setRemoteEnabled(bool enabled);
 
     void downloadNodeAtIndex(const QModelIndex &curLeft, const QModelIndex &curRight);
diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp
index 1eb648f48..117673743 100644
--- a/cockatrice/src/client/tabs/tab_room.cpp
+++ b/cockatrice/src/client/tabs/tab_room.cpp
@@ -1,9 +1,9 @@
 #include "tab_room.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../dialogs/dlg_settings.h"
 #include "../../game/game_selector.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"
@@ -103,7 +103,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     hbox->addWidget(userList, 1);
 
     aLeaveRoom = new QAction(this);
-    connect(aLeaveRoom, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeaveRoom, &QAction::triggered, this, &TabRoom::closeRequest);
 
     roomMenu = new QMenu(this);
     roomMenu->addAction(aLeaveRoom);
@@ -173,11 +173,11 @@ void TabRoom::actShowPopup(const QString &message)
     }
 }
 
-void TabRoom::closeRequest(bool /*forced*/)
+void TabRoom::closeEvent(QCloseEvent *event)
 {
     sendRoomCommand(prepareRoomCommand(Command_LeaveRoom()));
     emit roomClosing(this);
-    close();
+    event->accept();
 }
 
 void TabRoom::tabActivated()
diff --git a/cockatrice/src/client/tabs/tab_room.h b/cockatrice/src/client/tabs/tab_room.h
index ca88a256f..4c0c6c18f 100644
--- a/cockatrice/src/client/tabs/tab_room.h
+++ b/cockatrice/src/client/tabs/tab_room.h
@@ -88,13 +88,15 @@ private slots:
     void processRemoveMessagesEvent(const Event_RemoveMessages &event);
     void refreshShortcuts();
 
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
 public:
     TabRoom(TabSupervisor *_tabSupervisor,
             AbstractClient *_client,
             ServerInfo_User *_ownUser,
             const ServerInfo_Room &info);
     void retranslateUi() override;
-    void closeRequest(bool forced = false) override;
     void tabActivated() override;
     void processRoomEvent(const RoomEvent &event);
     int getRoomId() const
diff --git a/cockatrice/src/client/tabs/tab_server.cpp b/cockatrice/src/client/tabs/tab_server.cpp
index 24c3e7839..989e98131 100644
--- a/cockatrice/src/client/tabs/tab_server.cpp
+++ b/cockatrice/src/client/tabs/tab_server.cpp
@@ -1,6 +1,6 @@
 #include "tab_server.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_widget.h"
 #include "pb/event_list_rooms.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index 4ed0e5a6b..feb989fbf 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -1,7 +1,7 @@
 #include "tab_supervisor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
 #include "../../settings/cache_settings.h"
@@ -182,7 +182,16 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
 
 TabSupervisor::~TabSupervisor()
 {
-    stop();
+    // Note: this used to call stop(), but stop() is doing a bunch of stuff including emitting some signals,
+    // and we don't want to do that in a destructor.
+
+    for (auto &localClient : localClients) {
+        localClient->deleteLater();
+    }
+    localClients.clear();
+
+    delete userInfo;
+    userInfo = nullptr;
 }
 
 void TabSupervisor::retranslateUi()
@@ -268,26 +277,6 @@ void TabSupervisor::closeEvent(QCloseEvent *event)
             event->ignore();
         }
     }
-
-    // Close the game tabs in order to make sure they store their layout.
-    QSet<int> gameTabsToRemove;
-    for (auto it = gameTabs.begin(), end = gameTabs.end(); it != end; ++it) {
-        if (it.value()->close()) {
-            // Hotfix: the tab owns the `QMenu`s so they need to be cleared,
-            // otherwise we end up with use-after-free bugs.
-            if (it.value() == currentWidget()) {
-                emit setMenu();
-            }
-
-            gameTabsToRemove.insert(it.key());
-        } else {
-            event->ignore();
-        }
-    }
-
-    for (auto tabId : gameTabsToRemove) {
-        gameTabs.remove(tabId);
-    }
 }
 
 AbstractClient *TabSupervisor::getClient() const
@@ -375,7 +364,7 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager
         // If managed, all close requests should go through the menu action
         connect(closeButton, &CloseButton::clicked, this, [manager] { checkAndTrigger(manager, false); });
     } else {
-        connect(closeButton, &CloseButton::clicked, tab, [tab] { tab->closeRequest(); });
+        connect(closeButton, &CloseButton::clicked, tab, &Tab::closeRequest);
     }
     tabBar()->setTabButton(tabIndex, closeSide, closeButton);
 }
@@ -469,16 +458,16 @@ void TabSupervisor::stop()
         emit localGameEnded();
     } else {
         if (tabAccount) {
-            tabAccount->closeRequest(true);
+            tabAccount->close();
         }
         if (tabServer) {
-            tabServer->closeRequest(true);
+            tabServer->close();
         }
         if (tabAdmin) {
-            tabAdmin->closeRequest(true);
+            tabAdmin->close();
         }
         if (tabLog) {
-            tabLog->closeRequest(true);
+            tabLog->close();
         }
     }
 
@@ -497,7 +486,7 @@ void TabSupervisor::stop()
     }
 
     for (const auto tab : tabsToDelete) {
-        tab->closeRequest(true);
+        tab->close();
     }
 
     userListManager->handleDisconnect();
@@ -521,7 +510,7 @@ void TabSupervisor::openTabVisualDeckStorage()
 {
     tabVisualDeckStorage = new TabDeckStorageVisual(this);
     myAddTab(tabVisualDeckStorage, aTabVisualDeckStorage);
-    connect(tabVisualDeckStorage, &Tab::closed, this, [this] {
+    connect(tabVisualDeckStorage, &QObject::destroyed, this, [this] {
         tabVisualDeckStorage = nullptr;
         aTabVisualDeckStorage->setChecked(false);
     });
@@ -544,7 +533,7 @@ void TabSupervisor::openTabServer()
     tabServer = new TabServer(this, client);
     connect(tabServer, &TabServer::roomJoined, this, &TabSupervisor::addRoomTab);
     myAddTab(tabServer, aTabServer);
-    connect(tabServer, &Tab::closed, this, [this] {
+    connect(tabServer, &QObject::destroyed, this, [this] {
         tabServer = nullptr;
         aTabServer->setChecked(false);
     });
@@ -569,7 +558,7 @@ void TabSupervisor::openTabAccount()
     connect(tabAccount, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined);
     connect(tabAccount, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft);
     myAddTab(tabAccount, aTabAccount);
-    connect(tabAccount, &Tab::closed, this, [this] {
+    connect(tabAccount, &QObject::destroyed, this, [this] {
         tabAccount = nullptr;
         aTabAccount->setChecked(false);
     });
@@ -592,7 +581,7 @@ void TabSupervisor::openTabDeckStorage()
     tabDeckStorage = new TabDeckStorage(this, client, userInfo);
     connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::openDeckInNewTab);
     myAddTab(tabDeckStorage, aTabDeckStorage);
-    connect(tabDeckStorage, &Tab::closed, this, [this] {
+    connect(tabDeckStorage, &QObject::destroyed, this, [this] {
         tabDeckStorage = nullptr;
         aTabDeckStorage->setChecked(false);
     });
@@ -615,7 +604,7 @@ void TabSupervisor::openTabReplays()
     tabReplays = new TabReplays(this, client, userInfo);
     connect(tabReplays, &TabReplays::openReplay, this, &TabSupervisor::openReplay);
     myAddTab(tabReplays, aTabReplays);
-    connect(tabReplays, &Tab::closed, this, [this] {
+    connect(tabReplays, &QObject::destroyed, this, [this] {
         tabReplays = nullptr;
         aTabReplays->setChecked(false);
     });
@@ -638,7 +627,7 @@ void TabSupervisor::openTabAdmin()
     tabAdmin = new TabAdmin(this, client, (userInfo->user_level() & ServerInfo_User::IsAdmin));
     connect(tabAdmin, &TabAdmin::adminLockChanged, this, &TabSupervisor::adminLockChanged);
     myAddTab(tabAdmin, aTabAdmin);
-    connect(tabAdmin, &Tab::closed, this, [this] {
+    connect(tabAdmin, &QObject::destroyed, this, [this] {
         tabAdmin = nullptr;
         aTabAdmin->setChecked(false);
     });
@@ -660,7 +649,7 @@ void TabSupervisor::openTabLog()
 {
     tabLog = new TabLog(this, client);
     myAddTab(tabLog, aTabLog);
-    connect(tabLog, &Tab::closed, this, [this] {
+    connect(tabLog, &QObject::destroyed, this, [this] {
         tabLog = nullptr;
         aTabAdmin->setChecked(false);
     });
diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
index 1e7600a75..0f31297ab 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
@@ -11,6 +11,7 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
+#include <QThreadPool>
 
 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};
@@ -28,16 +29,7 @@ PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *work
     // Hook up signals to settings
     connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
 
-    pictureLoaderThread = new QThread;
-    moveToThread(pictureLoaderThread);
-
-    connect(pictureLoaderThread, &QThread::started, this, &PictureLoaderWorkerWork::startNextPicDownload);
-
-    // clean up threads once loading finishes
-    connect(this, &QObject::destroyed, pictureLoaderThread, &QThread::quit);
-    connect(pictureLoaderThread, &QThread::finished, pictureLoaderThread, &QObject::deleteLater);
-
-    pictureLoaderThread->start(QThread::LowPriority);
+    startNextPicDownload();
 }
 
 void PictureLoaderWorkerWork::startNextPicDownload()
diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
index d03160463..a323c2f1d 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
@@ -33,7 +33,6 @@ public slots:
     void handleNetworkReply(QNetworkReply *reply);
 
 private:
-    QThread *pictureLoaderThread;
     bool picDownload;
 
     void startNextPicDownload();
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
index 053929bef..4e8711b30 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -3,7 +3,7 @@
 
 #include "../../../../deck/custom_line_edit.h"
 #include "../../../../game/cards/card_database_model.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QHBoxLayout>
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 0530b87a0..b81bf6096 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -3,7 +3,7 @@
 
 #include "../../../../deck/custom_line_edit.h"
 #include "../../../../game/cards/card_info.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
index 9cd8d8d6f..46d7f5de1 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -1,7 +1,7 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QDockWidget>
diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp
index 62b6031fd..168a21ee7 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp
@@ -140,16 +140,22 @@ void CardAmountWidget::updateCardCount()
  */
 void CardAmountWidget::addPrinting(const QString &zone)
 {
+    // Add the card and expand the list UI
     auto newCardIndex = deckModel->addCard(rootCard, zone);
     recursiveExpand(newCardIndex);
+
+    // Check if a card without a providerId already exists in the deckModel and replace it, if so.
     QModelIndex find_card = deckModel->findCard(rootCard.getName(), zone);
-    if (find_card.isValid() && find_card != newCardIndex) {
+    QString foundProviderId = deckModel->data(find_card.sibling(find_card.row(), 4), Qt::DisplayRole).toString();
+    if (find_card.isValid() && find_card != newCardIndex && foundProviderId == "") {
         auto amount = deckModel->data(find_card, Qt::DisplayRole);
         for (int i = 0; i < amount.toInt() - 1; i++) {
             deckModel->addCard(rootCard, zone);
         }
         deckModel->removeRow(find_card.row(), find_card.parent());
     }
+
+    // Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
     newCardIndex = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
                                        rootCard.getPrinting().getProperty("num"));
     deckView->setCurrentIndex(newCardIndex);
diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
index 9b729069f..eb30bd88f 100644
--- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
@@ -6,7 +6,7 @@
 #include "../../../../game/cards/card_database.h"
 #include "../../../../game/cards/card_database_model.h"
 #include "../../../../game/filters/filter_tree_model.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../../layouts/flow_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
diff --git a/cockatrice/src/client/ui/window_main.h b/cockatrice/src/client/ui/window_main.h
index 420aac214..76901c9d4 100644
--- a/cockatrice/src/client/ui/window_main.h
+++ b/cockatrice/src/client/ui/window_main.h
@@ -20,7 +20,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "../game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "pb/response.pb.h"
 
 #include <QList>
diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
index 965e71c56..eef8461bc 100644
--- a/cockatrice/src/deck/deck_loader.cpp
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -397,6 +397,7 @@ void DeckLoader::clearSetNamesAndNumbers()
         // Set the providerId on the card
         card->setCardSetShortName(nullptr);
         card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
     };
 
     forEachCard(clearSetNameAndNumber);
diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp
index e601b1b95..ea1c7a8f7 100644
--- a/cockatrice/src/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@@ -102,9 +102,15 @@ void DlgCreateGame::sharedCtor()
     startingLifeTotalEdit->setValue(20);
     startingLifeTotalLabel->setBuddy(startingLifeTotalEdit);
 
+    shareDecklistsOnLoadLabel = new QLabel(tr("Open decklists in lobby"));
+    shareDecklistsOnLoadCheckBox = new QCheckBox();
+    shareDecklistsOnLoadLabel->setBuddy(shareDecklistsOnLoadCheckBox);
+
     QGridLayout *gameSetupOptionsLayout = new QGridLayout;
     gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1);
+    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadLabel, 1, 0);
+    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 1);
     gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"));
     gameSetupOptionsGroupBox->setLayout(gameSetupOptionsLayout);
 
@@ -149,6 +155,7 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap<int, QString> &_gameType
     spectatorsSeeEverythingCheckBox->setChecked(SettingsCache::instance().getSpectatorsCanSeeEverything());
     createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().getCreateGameAsSpectator());
     startingLifeTotalEdit->setValue(SettingsCache::instance().getDefaultStartingLifeTotal());
+    shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().getShareDecklistsOnLoad());
 
     if (!rememberGameSettings->isChecked()) {
         actReset();
@@ -181,6 +188,7 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
     spectatorsSeeEverythingCheckBox->setEnabled(false);
     createGameAsSpectatorCheckBox->setEnabled(false);
     startingLifeTotalEdit->setEnabled(false);
+    shareDecklistsOnLoadCheckBox->setEnabled(false);
 
     descriptionEdit->setText(QString::fromStdString(gameInfo.description()));
     maxPlayersEdit->setValue(gameInfo.max_players());
@@ -225,6 +233,7 @@ void DlgCreateGame::actReset()
     createGameAsSpectatorCheckBox->setChecked(false);
 
     startingLifeTotalEdit->setValue(20);
+    shareDecklistsOnLoadCheckBox->setChecked(false);
 
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
     while (gameTypeCheckBoxIterator.hasNext()) {
@@ -253,6 +262,7 @@ void DlgCreateGame::actOK()
     cmd.set_join_as_judge(QApplication::keyboardModifiers() & Qt::ShiftModifier);
     cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked());
     cmd.set_starting_life_total(startingLifeTotalEdit->value());
+    cmd.set_share_decklists_on_load(shareDecklistsOnLoadCheckBox->isChecked());
 
     QString _gameTypes = QString();
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
@@ -276,6 +286,7 @@ void DlgCreateGame::actOK()
         SettingsCache::instance().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
         SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
         SettingsCache::instance().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
+        SettingsCache::instance().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
         SettingsCache::instance().setGameTypes(_gameTypes);
     }
     PendingCommand *pend = room->prepareRoomCommand(cmd);
diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/dialogs/dlg_create_game.h
index e14278aef..ae10bf01b 100644
--- a/cockatrice/src/dialogs/dlg_create_game.h
+++ b/cockatrice/src/dialogs/dlg_create_game.h
@@ -36,12 +36,13 @@ private:
     QMap<int, QRadioButton *> gameTypeCheckBoxes;
 
     QGroupBox *generalGroupBox, *spectatorsGroupBox, *gameSetupOptionsGroupBox;
-    QLabel *descriptionLabel, *passwordLabel, *maxPlayersLabel, *startingLifeTotalLabel;
+    QLabel *descriptionLabel, *passwordLabel, *maxPlayersLabel, *startingLifeTotalLabel, *shareDecklistsOnLoadLabel;
     QLineEdit *descriptionEdit, *passwordEdit;
     QSpinBox *maxPlayersEdit, *startingLifeTotalEdit;
     QCheckBox *onlyBuddiesCheckBox, *onlyRegisteredCheckBox;
     QCheckBox *spectatorsAllowedCheckBox, *spectatorsNeedPasswordCheckBox, *spectatorsCanTalkCheckBox,
         *spectatorsSeeEverythingCheckBox, *createGameAsSpectatorCheckBox;
+    QCheckBox *shareDecklistsOnLoadCheckBox;
     QDialogButtonBox *buttonBox;
     QPushButton *clearButton;
     QCheckBox *rememberGameSettings;
diff --git a/cockatrice/src/dialogs/dlg_create_token.cpp b/cockatrice/src/dialogs/dlg_create_token.cpp
index 2f37c7be6..064c77fa1 100644
--- a/cockatrice/src/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/dialogs/dlg_create_token.cpp
@@ -198,7 +198,16 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
         annotationEdit->setText("");
     }
 
-    pic->setCard(CardDatabaseManager::getInstance()->getPreferredCard(cardInfo));
+    const auto &cardProviderId =
+        SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName());
+    if (!cardProviderId.isEmpty()) {
+        CardRef ref;
+        ref.name = cardInfo->getName();
+        ref.providerId = cardProviderId;
+        pic->setCard(CardDatabaseManager::getInstance()->getCard(ref));
+    } else {
+        pic->setCard(CardDatabaseManager::getInstance()->getPreferredCard(cardInfo));
+    }
 }
 
 void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const
@@ -250,5 +259,6 @@ TokenInfo DlgCreateToken::getTokenInfo() const
             .pt = ptEdit->text(),
             .annotation = annotationEdit->text(),
             .destroy = destroyCheckBox->isChecked(),
-            .faceDown = faceDownCheckBox->isChecked()};
+            .faceDown = faceDownCheckBox->isChecked(),
+            .providerId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(nameEdit->text())};
 }
diff --git a/cockatrice/src/dialogs/dlg_create_token.h b/cockatrice/src/dialogs/dlg_create_token.h
index cd1b48c81..df00e3d75 100644
--- a/cockatrice/src/dialogs/dlg_create_token.h
+++ b/cockatrice/src/dialogs/dlg_create_token.h
@@ -25,6 +25,7 @@ struct TokenInfo
     QString annotation;
     bool destroy = true;
     bool faceDown = false;
+    QString providerId;
 };
 
 class DlgCreateToken : public QDialog
diff --git a/cockatrice/src/dialogs/dlg_filter_games.cpp b/cockatrice/src/dialogs/dlg_filter_games.cpp
index f0fdaaa92..0c5191f99 100644
--- a/cockatrice/src/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/dialogs/dlg_filter_games.cpp
@@ -40,6 +40,9 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddy"));
     hideNotBuddyCreatedGames->setChecked(gamesProxyModel->getHideNotBuddyCreatedGames());
 
+    hideOpenDecklistGames = new QCheckBox(tr("Hide games with forced open decklists"));
+    hideOpenDecklistGames->setChecked(gamesProxyModel->getHideOpenDecklistGames());
+
     maxGameAgeComboBox = new QComboBox();
     maxGameAgeComboBox->setEditable(false);
     maxGameAgeComboBox->addItems(gameAgeMap.values());
@@ -115,6 +118,7 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     restrictionsLayout->addWidget(hideBuddiesOnlyGames, 3, 0);
     restrictionsLayout->addWidget(hideIgnoredUserGames, 4, 0);
     restrictionsLayout->addWidget(hideNotBuddyCreatedGames, 5, 0);
+    restrictionsLayout->addWidget(hideOpenDecklistGames, 6, 0);
 
     auto *restrictionsGroupBox = new QGroupBox(tr("Restrictions"));
     restrictionsGroupBox->setLayout(restrictionsLayout);
@@ -218,6 +222,11 @@ bool DlgFilterGames::getHideNotBuddyCreatedGames() const
     return hideNotBuddyCreatedGames->isChecked();
 }
 
+bool DlgFilterGames::getHideOpenDecklistGames() const
+{
+    return hideOpenDecklistGames->isChecked();
+}
+
 QString DlgFilterGames::getGameNameFilter() const
 {
     return gameNameFilterEdit->text();
diff --git a/cockatrice/src/dialogs/dlg_filter_games.h b/cockatrice/src/dialogs/dlg_filter_games.h
index 373af389f..1120a64ee 100644
--- a/cockatrice/src/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/dialogs/dlg_filter_games.h
@@ -27,6 +27,7 @@ private:
     QCheckBox *hidePasswordProtectedGames;
     QCheckBox *hideIgnoredUserGames;
     QCheckBox *hideNotBuddyCreatedGames;
+    QCheckBox *hideOpenDecklistGames;
     QLineEdit *gameNameFilterEdit;
     QLineEdit *creatorNameFilterEdit;
     QMap<int, QCheckBox *> gameTypeFilterCheckBoxes;
@@ -57,6 +58,8 @@ public:
     void setShowPasswordProtectedGames(bool _passwordProtectedGamesHidden);
     bool getHideBuddiesOnlyGames() const;
     void setHideBuddiesOnlyGames(bool _hideBuddiesOnlyGames);
+    bool getHideOpenDecklistGames() const;
+    void setHideOpenDecklistGames(bool _hideOpenDecklistGames);
     bool getHideIgnoredUserGames() const;
     void setHideIgnoredUserGames(bool _hideIgnoredUserGames);
     bool getHideNotBuddyCreatedGames() const;
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
index c1d50b2ba..1fb77426e 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -24,30 +24,17 @@ CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef
 {
     owner->addCard(this);
 
-    cardMenu = new QMenu;
-    ptMenu = new QMenu;
-    moveMenu = new QMenu;
-
     connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) {
         if (counters.contains(counterId))
             update();
     });
-
-    retranslateUi();
-}
-
-CardItem::~CardItem()
-{
-    delete cardMenu;
-    delete ptMenu;
-    delete moveMenu;
 }
 
 void CardItem::prepareDelete()
 {
     if (owner != nullptr) {
-        if (owner->getCardMenu() == cardMenu) {
-            owner->setCardMenu(nullptr);
+        if (owner->getGame()->getActiveCard() == this) {
+            owner->updateCardMenu(nullptr);
             owner->getGame()->setActiveCard(nullptr);
         }
         owner = nullptr;
@@ -79,8 +66,6 @@ void CardItem::setZone(CardZone *_zone)
 
 void CardItem::retranslateUi()
 {
-    moveMenu->setTitle(tr("&Move to"));
-    ptMenu->setTitle(tr("&Power / toughness"));
 }
 
 void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -274,7 +259,7 @@ void CardItem::deleteDragItem()
 
 void CardItem::drawArrow(const QColor &arrowColor)
 {
-    if (static_cast<TabGame *>(owner->parent())->getSpectator())
+    if (static_cast<TabGame *>(owner->parent())->isSpectator())
         return;
 
     Player *arrowOwner = static_cast<TabGame *>(owner->parent())->getActiveLocalPlayer();
@@ -297,7 +282,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
 
 void CardItem::drawAttachArrow()
 {
-    if (static_cast<TabGame *>(owner->parent())->getSpectator())
+    if (static_cast<TabGame *>(owner->parent())->isSpectator())
         return;
 
     auto *arrow = new ArrowAttachItem(this);
@@ -422,9 +407,13 @@ void CardItem::handleClickedToPlay(bool shiftHeld)
 void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::RightButton) {
-        if (cardMenu != nullptr && !cardMenu->isEmpty() && owner != nullptr) {
-            cardMenu->popup(event->screenPos());
-            return;
+
+        if (owner != nullptr) {
+            owner->getGame()->setActiveCard(this);
+            if (QMenu *cardMenu = owner->updateCardMenu(this)) {
+                cardMenu->popup(event->screenPos());
+                return;
+            }
         }
     } else if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) &&
                (!SettingsCache::instance().getDoubleClickToPlay())) {
@@ -477,11 +466,11 @@ QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if ((change == ItemSelectedHasChanged) && owner != nullptr) {
         if (value == true) {
-            owner->setCardMenu(cardMenu);
             owner->getGame()->setActiveCard(this);
-        } else if (owner->getCardMenu() == cardMenu) {
-            owner->setCardMenu(nullptr);
+            owner->updateCardMenu(this);
+        } else if (owner->scene()->selectedItems().isEmpty()) {
             owner->getGame()->setActiveCard(nullptr);
+            owner->updateCardMenu(nullptr);
         }
     }
     return AbstractCardItem::itemChange(change, value);
diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h
index 565c51fbc..569079092 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game/board/card_item.h
@@ -33,8 +33,6 @@ private:
     CardItem *attachedTo;
     QList<CardItem *> attachedCards;
 
-    QMenu *cardMenu, *ptMenu, *moveMenu;
-
     void prepareDelete();
     void handleClickedToPlay(bool shiftHeld);
 public slots:
@@ -54,7 +52,7 @@ public:
                       const CardRef &cardRef = {},
                       int _cardid = -1,
                       CardZone *_zone = nullptr);
-    ~CardItem() override;
+
     void retranslateUi();
     CardZone *getZone() const
     {
@@ -135,19 +133,6 @@ public:
     void resetState(bool keepAnnotations = false);
     void processCardInfo(const ServerInfo_Card &_info);
 
-    QMenu *getCardMenu() const
-    {
-        return cardMenu;
-    }
-    QMenu *getPTMenu() const
-    {
-        return ptMenu;
-    }
-    QMenu *getMoveMenu() const
-    {
-        return moveMenu;
-    }
-
     bool animationEvent();
     CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
     void deleteDragItem();
diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp
index 884919308..f88cb497a 100644
--- a/cockatrice/src/game/cards/card_database.cpp
+++ b/cockatrice/src/game/cards/card_database.cpp
@@ -458,6 +458,12 @@ bool CardDatabase::isPreferredPrinting(const CardRef &cardRef) const
     return cardRef.providerId == getPreferredPrintingProviderId(cardRef.name);
 }
 
+ExactCard CardDatabase::getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const
+{
+    PrintingInfo relatedPrinting = getSpecificPrinting(cardName, otherPrinting.getSet()->getCorrectedShortName(), "");
+    return ExactCard(guessCard({cardName}).getCardPtr(), relatedPrinting);
+}
+
 void CardDatabase::refreshCachedReverseRelatedCards()
 {
     for (const CardInfoPtr &card : cards)
diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h
index 8b1b2926f..0654c7494 100644
--- a/cockatrice/src/game/cards/card_database.h
+++ b/cockatrice/src/game/cards/card_database.h
@@ -82,6 +82,7 @@ public:
     getSpecificPrinting(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const;
     QString getPreferredPrintingProviderId(const QString &cardName) const;
     bool isPreferredPrinting(const CardRef &cardRef) const;
+    ExactCard getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const;
 
     [[nodiscard]] ExactCard guessCard(const CardRef &cardRef) const;
 
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
new file mode 100644
index 000000000..fc3c63acf
--- /dev/null
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
@@ -0,0 +1,64 @@
+#include "tabbed_deck_view_container.h"
+
+#include "../../client/tabs/tab_game.h"
+#include "deck_view.h"
+
+TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
+    : QTabWidget(nullptr), playerId(_playerId), parentGame(parent)
+{
+    setTabsClosable(true);
+    connect(this, &QTabWidget::tabCloseRequested, this, &TabbedDeckViewContainer::closeTab);
+
+    playerDeckView = new DeckViewContainer(playerId, parentGame);
+    int playerTabIndex = addTab(playerDeckView, "Your Deck");
+    tabBar()->setTabButton(playerTabIndex, QTabBar::RightSide, nullptr);
+    updateTabBarVisibility();
+}
+
+void TabbedDeckViewContainer::addOpponentDeckView(const DeckList &opponentDeck, int opponentId, QString opponentName)
+{
+    if (opponentDeckViews.contains(opponentId)) {
+        opponentDeckViews[opponentId]->setDeck(opponentDeck);
+    } else {
+        auto *opponentDeckView = new DeckView(this);
+        opponentDeckView->setDeck(opponentDeck);
+
+        addTab(opponentDeckView, QString("%1's Deck").arg(opponentName));
+
+        opponentDeckViews.insert(opponentId, opponentDeckView);
+    }
+    updateTabBarVisibility();
+}
+
+void TabbedDeckViewContainer::closeTab(int index)
+{
+    QWidget *widgetToClose = widget(index);
+
+    // Prevent removing the player tab
+    if (widgetToClose == playerDeckView) {
+        return;
+    }
+
+    // Remove it from map if it's an opponent
+    auto it = opponentDeckViews.begin();
+    while (it != opponentDeckViews.end()) {
+        if (it.value() == widgetToClose) {
+            it = opponentDeckViews.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    removeTab(index);
+    widgetToClose->deleteLater();
+    updateTabBarVisibility();
+}
+
+void TabbedDeckViewContainer::updateTabBarVisibility()
+{
+    if (tabBar()->count() <= 1) {
+        tabBar()->hide();
+    } else {
+        tabBar()->show();
+    }
+}
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.h b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
new file mode 100644
index 000000000..4b4769ece
--- /dev/null
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
@@ -0,0 +1,23 @@
+#ifndef TABBED_DECK_VIEW_CONTAINER_H
+#define TABBED_DECK_VIEW_CONTAINER_H
+#include "deck_view_container.h"
+
+#include <QTabWidget>
+
+class TabbedDeckViewContainer : public QTabWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TabbedDeckViewContainer(int _playerId, TabGame *parent);
+    void closeTab(int index);
+    void updateTabBarVisibility();
+    void addOpponentDeckView(const DeckList &opponentDeck, int opponentId, QString opponentName);
+    int playerId;
+    TabGame *parentGame;
+    DeckViewContainer *playerDeckView;
+
+    QMap<int, DeckView *> opponentDeckViews;
+};
+
+#endif // TABBED_DECK_VIEW_CONTAINER_H
diff --git a/cockatrice/src/game/game_selector.cpp b/cockatrice/src/game/game_selector.cpp
index 8b71fe187..e03feae36 100644
--- a/cockatrice/src/game/game_selector.cpp
+++ b/cockatrice/src/game/game_selector.cpp
@@ -1,6 +1,5 @@
 #include "game_selector.h"
 
-#include "../client/game_logic/abstract_client.h"
 #include "../client/get_text_with_max.h"
 #include "../client/tabs/tab_account.h"
 #include "../client/tabs/tab_game.h"
@@ -8,6 +7,7 @@
 #include "../client/tabs/tab_supervisor.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../dialogs/dlg_filter_games.h"
+#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
 #include "games_model.h"
@@ -161,6 +161,7 @@ void GameSelector::actSetFilter()
     gameListProxyModel->setHidePasswordProtectedGames(dlg.getHidePasswordProtectedGames());
     gameListProxyModel->setHideIgnoredUserGames(dlg.getHideIgnoredUserGames());
     gameListProxyModel->setHideNotBuddyCreatedGames(dlg.getHideNotBuddyCreatedGames());
+    gameListProxyModel->setHideOpenDecklistGames(dlg.getHideOpenDecklistGames());
     gameListProxyModel->setGameNameFilter(dlg.getGameNameFilter());
     gameListProxyModel->setCreatorNameFilter(dlg.getCreatorNameFilter());
     gameListProxyModel->setGameTypeFilter(dlg.getGameTypeFilter());
diff --git a/cockatrice/src/game/games_model.cpp b/cockatrice/src/game/games_model.cpp
index 03c72b584..fa908344c 100644
--- a/cockatrice/src/game/games_model.cpp
+++ b/cockatrice/src/game/games_model.cpp
@@ -153,6 +153,8 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                         result.append(tr("buddies only"));
                     if (gameentry.only_registered())
                         result.append(tr("reg. users only"));
+                    if (gameentry.share_decklists_on_load())
+                        result.append(tr("open decklists"));
                     return result.join(", ");
                 }
                 case Qt::DecorationRole: {
@@ -320,6 +322,12 @@ void GamesProxyModel::setHideNotBuddyCreatedGames(bool value)
     invalidateFilter();
 }
 
+void GamesProxyModel::setHideOpenDecklistGames(bool _hideOpenDecklistGames)
+{
+    hideOpenDecklistGames = _hideOpenDecklistGames;
+    invalidateFilter();
+}
+
 void GamesProxyModel::setGameNameFilter(const QString &_gameNameFilter)
 {
     gameNameFilter = _gameNameFilter;
@@ -398,6 +406,7 @@ void GamesProxyModel::resetFilterParameters()
     hideBuddiesOnlyGames = false;
     hideIgnoredUserGames = false;
     hideNotBuddyCreatedGames = false;
+    hideOpenDecklistGames = false;
     gameNameFilter = QString();
     creatorNameFilter = QString();
     gameTypeFilter.clear();
@@ -415,7 +424,7 @@ void GamesProxyModel::resetFilterParameters()
 bool GamesProxyModel::areFilterParametersSetToDefaults() const
 {
     return !hideFullGames && !hideGamesThatStarted && !hidePasswordProtectedGames && !hideBuddiesOnlyGames &&
-           !hideIgnoredUserGames && !hideNotBuddyCreatedGames && gameNameFilter.isEmpty() &&
+           !hideOpenDecklistGames && !hideIgnoredUserGames && !hideNotBuddyCreatedGames && gameNameFilter.isEmpty() &&
            creatorNameFilter.isEmpty() && gameTypeFilter.isEmpty() && maxPlayersFilterMin == DEFAULT_MAX_PLAYERS_MIN &&
            maxPlayersFilterMax == DEFAULT_MAX_PLAYERS_MAX && maxGameAge == DEFAULT_MAX_GAME_AGE &&
            !showOnlyIfSpectatorsCanWatch && !showSpectatorPasswordProtected && !showOnlyIfSpectatorsCanChat &&
@@ -431,6 +440,7 @@ void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameType
     hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames();
     hideBuddiesOnlyGames = gameFilters.isHideBuddiesOnlyGames();
     hideNotBuddyCreatedGames = gameFilters.isHideNotBuddyCreatedGames();
+    hideOpenDecklistGames = gameFilters.isHideOpenDecklistGames();
     gameNameFilter = gameFilters.getGameNameFilter();
     creatorNameFilter = gameFilters.getCreatorNameFilter();
     maxPlayersFilterMin = gameFilters.getMinPlayers();
@@ -461,6 +471,7 @@ void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameType
     gameFilters.setHidePasswordProtectedGames(hidePasswordProtectedGames);
     gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames);
     gameFilters.setHideNotBuddyCreatedGames(hideNotBuddyCreatedGames);
+    gameFilters.setHideOpenDecklistGames(hideOpenDecklistGames);
     gameFilters.setGameNameFilter(gameNameFilter);
     gameFilters.setCreatorNameFilter(creatorNameFilter);
 
@@ -504,6 +515,9 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
     if (hideBuddiesOnlyGames && game.only_buddies()) {
         return false;
     }
+    if (hideOpenDecklistGames && game.share_decklists_on_load()) {
+        return false;
+    }
     if (hideIgnoredUserGames && userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) {
         return false;
     }
diff --git a/cockatrice/src/game/games_model.h b/cockatrice/src/game/games_model.h
index f2a5d24d6..4b82a9056 100644
--- a/cockatrice/src/game/games_model.h
+++ b/cockatrice/src/game/games_model.h
@@ -81,6 +81,7 @@ private:
     bool hideGamesThatStarted;
     bool hidePasswordProtectedGames;
     bool hideNotBuddyCreatedGames;
+    bool hideOpenDecklistGames;
     QString gameNameFilter, creatorNameFilter;
     QSet<int> gameTypeFilter;
     quint32 maxPlayersFilterMin, maxPlayersFilterMax;
@@ -121,6 +122,11 @@ public:
         return hideNotBuddyCreatedGames;
     }
     void setHideNotBuddyCreatedGames(bool value);
+    bool getHideOpenDecklistGames() const
+    {
+        return hideOpenDecklistGames;
+    }
+    void setHideOpenDecklistGames(bool _hideOpenDecklistGames);
     QString getGameNameFilter() const
     {
         return gameNameFilter;
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index 4a83a9ae0..ccdf3e68f 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -150,8 +150,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
 
     stack = addZone(new StackZone(this, (int)table->boundingRect().height(), this));
 
-    hand = addZone(new HandZone(this,
-                                _local || _judge || (_parent->getSpectator() && _parent->getSpectatorsSeeEverything()),
+    hand = addZone(new HandZone(this, _local || _judge || (_parent->isSpectator() && _parent->isSpectatorsOmniscient()),
                                 (int)table->boundingRect().height(), this));
     connect(hand, &HandZone::cardCountChanged, handCounter, &HandCounter::updateNumber);
     connect(handCounter, &HandCounter::showContextMenu, hand, &HandZone::showContextMenu);
@@ -210,6 +209,8 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
         connect(aViewLibrary, &QAction::triggered, this, &Player::actViewLibrary);
         aViewHand = new QAction(this);
         connect(aViewHand, &QAction::triggered, this, &Player::actViewHand);
+        aSortHand = new QAction(this);
+        connect(aSortHand, &QAction::triggered, this, &Player::actSortHand);
 
         aViewTopCards = new QAction(this);
         connect(aViewTopCards, &QAction::triggered, this, &Player::actViewTopCards);
@@ -298,6 +299,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
     if (local || judge) {
         handMenu = playerMenu->addTearOffMenu(QString());
         handMenu->addAction(aViewHand);
+        handMenu->addAction(aSortHand);
         playerLists.append(mRevealHand = handMenu->addMenu(QString()));
         playerLists.append(mRevealRandomHandCard = handMenu->addMenu(QString()));
         handMenu->addSeparator();
@@ -417,6 +419,9 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
         connect(aCreateAnotherToken, &QAction::triggered, this, &Player::actCreateAnotherToken);
         aCreateAnotherToken->setEnabled(false);
 
+        aIncrementAllCardCounters = new QAction(this);
+        connect(aIncrementAllCardCounters, &QAction::triggered, this, &Player::incrementAllCardCounters);
+
         createPredefinedTokenMenu = new QMenu(QString());
         createPredefinedTokenMenu->setEnabled(false);
 
@@ -424,6 +429,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
 
         playerMenu->addSeparator();
         countersMenu = playerMenu->addMenu(QString());
+        playerMenu->addAction(aIncrementAllCardCounters);
         playerMenu->addSeparator();
         playerMenu->addAction(aUntapAll);
         playerMenu->addSeparator();
@@ -442,11 +448,6 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
         initSayMenu();
     }
 
-    aCardMenu = new QAction(this);
-    aCardMenu->setEnabled(false);
-    playerMenu->addSeparator();
-    playerMenu->addAction(aCardMenu);
-
     if (local || judge) {
 
         for (auto &playerList : playerLists) {
@@ -791,6 +792,7 @@ void Player::retranslateUi()
 
         aViewLibrary->setText(tr("&View library"));
         aViewHand->setText(tr("&View hand"));
+        aSortHand->setText(tr("&Sort hand"));
         aViewTopCards->setText(tr("View &top cards of library..."));
         aViewBottomCards->setText(tr("View bottom cards of library..."));
         mRevealLibrary->setTitle(tr("Reveal &library to..."));
@@ -843,6 +845,7 @@ void Player::retranslateUi()
             aViewZone->setText(tr("View custom zone '%1'").arg(aViewZone->data().toString()));
         }
 
+        aIncrementAllCardCounters->setText(tr("Increment all card counters"));
         aUntapAll->setText(tr("&Untap all permanents"));
         aRollDie->setText(tr("R&oll die..."));
         aCreateToken->setText(tr("&Create token..."));
@@ -861,8 +864,6 @@ void Player::retranslateUi()
         }
     }
 
-    aCardMenu->setText(tr("Selec&ted cards"));
-
     if (local) {
         sayMenu->setTitle(tr("S&ay"));
     }
@@ -954,43 +955,17 @@ void Player::setShortcutsActive()
     aMoveToHand->setShortcuts(shortcuts.getShortcut("Player/aMoveToHand"));
     aMoveToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveToGraveyard"));
     aMoveToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveToExile"));
+    aSortHand->setShortcuts(shortcuts.getShortcut("Player/aSortHand"));
 
     aSelectAll->setShortcuts(shortcuts.getShortcut("Player/aSelectAll"));
     aSelectRow->setShortcuts(shortcuts.getShortcut("Player/aSelectRow"));
     aSelectColumn->setShortcuts(shortcuts.getShortcut("Player/aSelectColumn"));
 
-    QList<QKeySequence> addCCShortCuts;
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCRed"));
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCYellow"));
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCGreen"));
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCCyan"));
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCPurple"));
-    addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCMagenta"));
-
-    QList<QKeySequence> removeCCShortCuts;
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCRed"));
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCYellow"));
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCGreen"));
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCCyan"));
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCPurple"));
-    removeCCShortCuts.append(shortcuts.getSingleShortcut("Player/aRCMagenta"));
-
-    QList<QKeySequence> setCCShortCuts;
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCRed"));
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCYellow"));
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCGreen"));
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCCyan"));
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCPurple"));
-    setCCShortCuts.append(shortcuts.getSingleShortcut("Player/aSCMagenta"));
-
-    for (int i = 0; i < addCCShortCuts.size(); ++i) {
-        aAddCounter[i]->setShortcut(addCCShortCuts.at(i));
-    }
-    for (int i = 0; i < removeCCShortCuts.size(); ++i) {
-        aRemoveCounter[i]->setShortcut(removeCCShortCuts.at(i));
-    }
-    for (int i = 0; i < setCCShortCuts.size(); ++i) {
-        aSetCounter[i]->setShortcut(setCCShortCuts.at(i));
+    static const QStringList colorWords = {"Red", "Yellow", "Green", "Cyan", "Purple", "Magenta"};
+    for (int i = 0; i < aAddCounter.size(); i++) {
+        aAddCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aCC" + colorWords[i]));
+        aRemoveCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aRC" + colorWords[i]));
+        aSetCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aSC" + colorWords[i]));
     }
 
     QMapIterator<int, AbstractCounter *> counterIterator(counters);
@@ -998,44 +973,45 @@ void Player::setShortcutsActive()
         counterIterator.next().value()->setShortcutsActive();
     }
 
-    aViewSideboard->setShortcut(shortcuts.getSingleShortcut("Player/aViewSideboard"));
-    aViewLibrary->setShortcut(shortcuts.getSingleShortcut("Player/aViewLibrary"));
-    aViewHand->setShortcut(shortcuts.getSingleShortcut("Player/aViewHand"));
-    aViewTopCards->setShortcut(shortcuts.getSingleShortcut("Player/aViewTopCards"));
-    aViewBottomCards->setShortcut(shortcuts.getSingleShortcut("Player/aViewBottomCards"));
-    aViewGraveyard->setShortcut(shortcuts.getSingleShortcut("Player/aViewGraveyard"));
-    aDrawCard->setShortcut(shortcuts.getSingleShortcut("Player/aDrawCard"));
-    aDrawCards->setShortcut(shortcuts.getSingleShortcut("Player/aDrawCards"));
-    aUndoDraw->setShortcut(shortcuts.getSingleShortcut("Player/aUndoDraw"));
-    aMulligan->setShortcut(shortcuts.getSingleShortcut("Player/aMulligan"));
-    aShuffle->setShortcut(shortcuts.getSingleShortcut("Player/aShuffle"));
-    aShuffleTopCards->setShortcut(shortcuts.getSingleShortcut("Player/aShuffleTopCards"));
-    aShuffleBottomCards->setShortcut(shortcuts.getSingleShortcut("Player/aShuffleBottomCards"));
-    aUntapAll->setShortcut(shortcuts.getSingleShortcut("Player/aUntapAll"));
-    aRollDie->setShortcut(shortcuts.getSingleShortcut("Player/aRollDie"));
-    aCreateToken->setShortcut(shortcuts.getSingleShortcut("Player/aCreateToken"));
-    aCreateAnotherToken->setShortcut(shortcuts.getSingleShortcut("Player/aCreateAnotherToken"));
-    aAlwaysRevealTopCard->setShortcut(shortcuts.getSingleShortcut("Player/aAlwaysRevealTopCard"));
-    aAlwaysLookAtTopCard->setShortcut(shortcuts.getSingleShortcut("Player/aAlwaysLookAtTopCard"));
-    aMoveTopToPlay->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopToPlay"));
-    aMoveTopToPlayFaceDown->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopToPlayFaceDown"));
-    aMoveTopCardToGraveyard->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardToGraveyard"));
-    aMoveTopCardsToGraveyard->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardsToGraveyard"));
-    aMoveTopCardToExile->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardToExile"));
-    aMoveTopCardsToExile->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardsToExile"));
-    aMoveTopCardsUntil->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardsUntil"));
-    aMoveTopCardToBottom->setShortcut(shortcuts.getSingleShortcut("Player/aMoveTopCardToBottom"));
-    aDrawBottomCard->setShortcut(shortcuts.getSingleShortcut("Player/aDrawBottomCard"));
-    aDrawBottomCards->setShortcut(shortcuts.getSingleShortcut("Player/aDrawBottomCards"));
-    aMoveBottomToPlay->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomToPlay"));
-    aMoveBottomToPlayFaceDown->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomToPlayFaceDown"));
-    aMoveBottomCardToGraveyard->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardToGrave"));
-    aMoveBottomCardsToGraveyard->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardsToGrave"));
-    aMoveBottomCardToExile->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardToExile"));
-    aMoveBottomCardsToExile->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardsToExile"));
-    aMoveBottomCardToTop->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardToTop"));
-    aPlayFacedown->setShortcut(shortcuts.getSingleShortcut("Player/aPlayFacedown"));
-    aPlay->setShortcut(shortcuts.getSingleShortcut("Player/aPlay"));
+    aIncrementAllCardCounters->setShortcuts(shortcuts.getShortcut("Player/aIncrementAllCardCounters"));
+    aViewSideboard->setShortcuts(shortcuts.getShortcut("Player/aViewSideboard"));
+    aViewLibrary->setShortcuts(shortcuts.getShortcut("Player/aViewLibrary"));
+    aViewHand->setShortcuts(shortcuts.getShortcut("Player/aViewHand"));
+    aViewTopCards->setShortcuts(shortcuts.getShortcut("Player/aViewTopCards"));
+    aViewBottomCards->setShortcuts(shortcuts.getShortcut("Player/aViewBottomCards"));
+    aViewGraveyard->setShortcuts(shortcuts.getShortcut("Player/aViewGraveyard"));
+    aDrawCard->setShortcuts(shortcuts.getShortcut("Player/aDrawCard"));
+    aDrawCards->setShortcuts(shortcuts.getShortcut("Player/aDrawCards"));
+    aUndoDraw->setShortcuts(shortcuts.getShortcut("Player/aUndoDraw"));
+    aMulligan->setShortcuts(shortcuts.getShortcut("Player/aMulligan"));
+    aShuffle->setShortcuts(shortcuts.getShortcut("Player/aShuffle"));
+    aShuffleTopCards->setShortcuts(shortcuts.getShortcut("Player/aShuffleTopCards"));
+    aShuffleBottomCards->setShortcuts(shortcuts.getShortcut("Player/aShuffleBottomCards"));
+    aUntapAll->setShortcuts(shortcuts.getShortcut("Player/aUntapAll"));
+    aRollDie->setShortcuts(shortcuts.getShortcut("Player/aRollDie"));
+    aCreateToken->setShortcuts(shortcuts.getShortcut("Player/aCreateToken"));
+    aCreateAnotherToken->setShortcuts(shortcuts.getShortcut("Player/aCreateAnotherToken"));
+    aAlwaysRevealTopCard->setShortcuts(shortcuts.getShortcut("Player/aAlwaysRevealTopCard"));
+    aAlwaysLookAtTopCard->setShortcuts(shortcuts.getShortcut("Player/aAlwaysLookAtTopCard"));
+    aMoveTopToPlay->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlay"));
+    aMoveTopToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlayFaceDown"));
+    aMoveTopCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToGraveyard"));
+    aMoveTopCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyard"));
+    aMoveTopCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToExile"));
+    aMoveTopCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExile"));
+    aMoveTopCardsUntil->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsUntil"));
+    aMoveTopCardToBottom->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToBottom"));
+    aDrawBottomCard->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCard"));
+    aDrawBottomCards->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCards"));
+    aMoveBottomToPlay->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlay"));
+    aMoveBottomToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlayFaceDown"));
+    aMoveBottomCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToGrave"));
+    aMoveBottomCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGrave"));
+    aMoveBottomCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToExile"));
+    aMoveBottomCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExile"));
+    aMoveBottomCardToTop->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToTop"));
+    aPlayFacedown->setShortcuts(shortcuts.getShortcut("Player/aPlayFacedown"));
+    aPlay->setShortcuts(shortcuts.getShortcut("Player/aPlay"));
 
     // Don't enable always-active shortcuts in local games, since it causes keyboard shortcuts to work inconsistently
     // when there are more than 1 player.
@@ -1084,6 +1060,8 @@ void Player::setShortcutsInactive()
     aMoveBottomCardsToGraveyard->setShortcut(QKeySequence());
     aMoveBottomCardToExile->setShortcut(QKeySequence());
     aMoveBottomCardsToExile->setShortcut(QKeySequence());
+    aIncrementAllCardCounters->setShortcut(QKeySequence());
+    aSortHand->setShortcut(QKeySequence());
 
     QMapIterator<int, AbstractCounter *> counterIterator(counters);
     while (counterIterator.hasNext()) {
@@ -1154,6 +1132,11 @@ void Player::actViewHand()
     static_cast<GameScene *>(scene())->toggleZoneView(this, "hand", -1);
 }
 
+void Player::actSortHand()
+{
+    hand->sortHand();
+}
+
 void Player::actViewTopCards()
 {
     int deckSize = zones.value("deck")->getCards().size();
@@ -1849,7 +1832,8 @@ void Player::actCreateToken()
 
     lastTokenInfo = dlg.getTokenInfo();
 
-    ExactCard correctedCard = CardDatabaseManager::getInstance()->guessCard({lastTokenInfo.name});
+    ExactCard correctedCard =
+        CardDatabaseManager::getInstance()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
         lastTokenTableRow = TableZone::clampValidTableRow(2 - correctedCard.getInfo().getTableRow());
@@ -1872,6 +1856,7 @@ void Player::actCreateAnotherToken()
     Command_CreateToken cmd;
     cmd.set_zone("table");
     cmd.set_card_name(lastTokenInfo.name.toStdString());
+    cmd.set_card_provider_id(lastTokenInfo.providerId.toStdString());
     cmd.set_color(lastTokenInfo.color.toStdString());
     cmd.set_pt(lastTokenInfo.pt.toStdString());
     cmd.set_annotation(lastTokenInfo.annotation.toStdString());
@@ -1912,9 +1897,9 @@ void Player::actCreateRelatedCard()
      * then let's allow it to be created via "create another token"
      */
     if (createRelatedFromRelation(sourceCard, cardRelation) && cardRelation->getCanCreateAnother()) {
-        ExactCard cardInfo =
-            CardDatabaseManager::getInstance()->getCard({cardRelation->getName(), sourceCard->getProviderId()});
-        setLastToken(cardInfo.getCardPtr());
+        ExactCard relatedCard = CardDatabaseManager::getInstance()->getCardFromSameSet(
+            cardRelation->getName(), sourceCard->getCard().getPrinting());
+        setLastToken(relatedCard.getCardPtr());
     }
 }
 
@@ -2076,13 +2061,18 @@ void Player::createCard(const CardItem *sourceCard,
     cmd.set_x(gridPoint.x());
     cmd.set_y(gridPoint.y());
 
+    ExactCard relatedCard = CardDatabaseManager::getInstance()->getCardFromSameSet(cardInfo->getName(),
+                                                                                   sourceCard->getCard().getPrinting());
+
     switch (attachType) {
         case CardRelation::DoesNotAttach:
             cmd.set_target_zone("table");
+            cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             break;
 
         case CardRelation::AttachTo:
             cmd.set_target_zone("table"); // We currently only support creating tokens on the table
+            cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             cmd.set_target_card_id(sourceCard->getId());
             cmd.set_target_mode(Command_CreateToken::ATTACH_TO);
             break;
@@ -2791,7 +2781,7 @@ void Player::processPlayerInfo(const ServerInfo_Player &info)
 
                 switch (zoneInfo.type()) {
                     case ServerInfo_Zone::PrivateZone:
-                        contentsKnown = local || judge || (game->getSpectator() && game->getSpectatorsSeeEverything());
+                        contentsKnown = local || judge || (game->isSpectator() && game->isSpectatorsOmniscient());
                         break;
 
                     case ServerInfo_Zone::PublicZone:
@@ -3038,6 +3028,51 @@ void Player::clearCounters()
     counters.clear();
 }
 
+void Player::incrementAllCardCounters()
+{
+    QList<CardItem *> cardsToUpdate;
+
+    auto selectedItems = scene()->selectedItems();
+    if (!selectedItems.isEmpty()) {
+        // If cards are selected, only update those
+        for (const auto &item : selectedItems) {
+            auto *card = static_cast<CardItem *>(item);
+            cardsToUpdate.append(card);
+        }
+    } else {
+        // If no cards selected, update all cards on table
+        const CardList &tableCards = table->getCards();
+        cardsToUpdate = tableCards;
+    }
+
+    QList<const ::google::protobuf::Message *> commandList;
+
+    for (const auto *card : cardsToUpdate) {
+        const auto &cardCounters = card->getCounters();
+
+        QMapIterator<int, int> counterIterator(cardCounters);
+        while (counterIterator.hasNext()) {
+            counterIterator.next();
+            int counterId = counterIterator.key();
+            int currentValue = counterIterator.value();
+            if (currentValue >= MAX_COUNTERS_ON_CARD) {
+                continue;
+            }
+
+            auto cmd = std::make_unique<Command_SetCardCounter>();
+            cmd->set_zone(card->getZone()->getName().toStdString());
+            cmd->set_card_id(card->getId());
+            cmd->set_counter_id(counterId);
+            cmd->set_counter_value(currentValue + 1);
+            commandList.append(cmd.release());
+        }
+    }
+
+    if (!commandList.isEmpty()) {
+        sendGameCommand(prepareGameCommand(commandList));
+    }
+}
+
 ArrowItem *Player::addArrow(const ServerInfo_Arrow &arrow)
 {
     const QMap<int, Player *> &playerList = game->getPlayers();
@@ -3861,20 +3896,12 @@ void Player::refreshShortcuts()
     }
 }
 
-void Player::updateCardMenu(const CardItem *card)
+QMenu *Player::createCardMenu(const CardItem *card)
 {
-    // If bad card OR is a spectator (as spectators don't need card menus), return
-    // only update the menu if the card is actually selected
-    if (card == nullptr || (game->isSpectator() && !judge) || game->getActiveCard() != card) {
-        return;
+    if (card == nullptr) {
+        return nullptr;
     }
 
-    QMenu *cardMenu = card->getCardMenu();
-    QMenu *ptMenu = card->getPTMenu();
-    QMenu *moveMenu = card->getMoveMenu();
-
-    cardMenu->clear();
-
     bool revealedCard = false;
     bool writeableCard = getLocalOrJudge();
     if (auto *view = qobject_cast<ZoneViewZone *>(card->getZone())) {
@@ -3887,6 +3914,8 @@ void Player::updateCardMenu(const CardItem *card)
         }
     }
 
+    QMenu *cardMenu = new QMenu;
+
     if (revealedCard) {
         cardMenu->addAction(aHide);
         cardMenu->addAction(aClone);
@@ -3897,18 +3926,6 @@ void Player::updateCardMenu(const CardItem *card)
     } else if (writeableCard) {
         bool canModifyCard = judge || card->getOwner() == this;
 
-        if (moveMenu->isEmpty() && canModifyCard) {
-            moveMenu->addAction(aMoveToTopLibrary);
-            moveMenu->addAction(aMoveToXfromTopOfLibrary);
-            moveMenu->addAction(aMoveToBottomLibrary);
-            moveMenu->addSeparator();
-            moveMenu->addAction(aMoveToHand);
-            moveMenu->addSeparator();
-            moveMenu->addAction(aMoveToGraveyard);
-            moveMenu->addSeparator();
-            moveMenu->addAction(aMoveToExile);
-        }
-
         if (card->getZone()) {
             if (card->getZone()->getName() == "table") {
                 // Card is on the battlefield
@@ -3924,23 +3941,7 @@ void Player::updateCardMenu(const CardItem *card)
                     cardMenu->addSeparator();
                     cardMenu->addAction(aSelectAll);
                     cardMenu->addAction(aSelectRow);
-                    return;
-                }
-
-                if (ptMenu->isEmpty()) {
-                    ptMenu->addAction(aIncP);
-                    ptMenu->addAction(aDecP);
-                    ptMenu->addAction(aFlowP);
-                    ptMenu->addSeparator();
-                    ptMenu->addAction(aIncT);
-                    ptMenu->addAction(aDecT);
-                    ptMenu->addAction(aFlowT);
-                    ptMenu->addSeparator();
-                    ptMenu->addAction(aIncPT);
-                    ptMenu->addAction(aDecPT);
-                    ptMenu->addSeparator();
-                    ptMenu->addAction(aSetPT);
-                    ptMenu->addAction(aResetPT);
+                    return cardMenu;
                 }
 
                 cardMenu->addAction(aTap);
@@ -3960,11 +3961,11 @@ void Player::updateCardMenu(const CardItem *card)
                 }
                 cardMenu->addAction(aDrawArrow);
                 cardMenu->addSeparator();
-                cardMenu->addMenu(ptMenu);
+                cardMenu->addMenu(createPtMenu());
                 cardMenu->addAction(aSetAnnotation);
                 cardMenu->addSeparator();
                 cardMenu->addAction(aClone);
-                cardMenu->addMenu(moveMenu);
+                cardMenu->addMenu(createMoveMenu());
                 cardMenu->addSeparator();
                 cardMenu->addAction(aSelectAll);
                 cardMenu->addAction(aSelectRow);
@@ -3988,7 +3989,7 @@ void Player::updateCardMenu(const CardItem *card)
                     cardMenu->addAction(aDrawArrow);
                     cardMenu->addSeparator();
                     cardMenu->addAction(aClone);
-                    cardMenu->addMenu(moveMenu);
+                    cardMenu->addMenu(createMoveMenu());
                     cardMenu->addSeparator();
                     cardMenu->addAction(aSelectAll);
                 } else {
@@ -4009,7 +4010,7 @@ void Player::updateCardMenu(const CardItem *card)
 
                     cardMenu->addSeparator();
                     cardMenu->addAction(aClone);
-                    cardMenu->addMenu(moveMenu);
+                    cardMenu->addMenu(createMoveMenu());
                     cardMenu->addSeparator();
                     cardMenu->addAction(aSelectAll);
                     cardMenu->addAction(aSelectColumn);
@@ -4039,7 +4040,7 @@ void Player::updateCardMenu(const CardItem *card)
 
                 cardMenu->addSeparator();
                 cardMenu->addAction(aClone);
-                cardMenu->addMenu(moveMenu);
+                cardMenu->addMenu(createMoveMenu());
 
                 // actions that are really wonky when done from deck or sideboard
                 if (card->getZone()->getName() == "hand") {
@@ -4060,7 +4061,7 @@ void Player::updateCardMenu(const CardItem *card)
                 }
             }
         } else {
-            cardMenu->addMenu(moveMenu);
+            cardMenu->addMenu(createMoveMenu());
         }
     } else {
         if (card->getZone() && card->getZone()->getName() != "hand") {
@@ -4074,6 +4075,42 @@ void Player::updateCardMenu(const CardItem *card)
             cardMenu->addAction(aSelectAll);
         }
     }
+
+    return cardMenu;
+}
+
+QMenu *Player::createMoveMenu() const
+{
+    QMenu *moveMenu = new QMenu("Move to");
+    moveMenu->addAction(aMoveToTopLibrary);
+    moveMenu->addAction(aMoveToXfromTopOfLibrary);
+    moveMenu->addAction(aMoveToBottomLibrary);
+    moveMenu->addSeparator();
+    moveMenu->addAction(aMoveToHand);
+    moveMenu->addSeparator();
+    moveMenu->addAction(aMoveToGraveyard);
+    moveMenu->addSeparator();
+    moveMenu->addAction(aMoveToExile);
+    return moveMenu;
+}
+
+QMenu *Player::createPtMenu() const
+{
+    QMenu *ptMenu = new QMenu("Power / toughness");
+    ptMenu->addAction(aIncP);
+    ptMenu->addAction(aDecP);
+    ptMenu->addAction(aFlowP);
+    ptMenu->addSeparator();
+    ptMenu->addAction(aIncT);
+    ptMenu->addAction(aDecT);
+    ptMenu->addAction(aFlowT);
+    ptMenu->addSeparator();
+    ptMenu->addAction(aIncPT);
+    ptMenu->addAction(aDecPT);
+    ptMenu->addSeparator();
+    ptMenu->addAction(aSetPT);
+    ptMenu->addAction(aResetPT);
+    return ptMenu;
 }
 
 void Player::addRelatedCardView(const CardItem *card, QMenu *cardMenu)
@@ -4130,8 +4167,8 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu)
     int index = 0;
     QAction *createRelatedCards = nullptr;
     for (const CardRelation *cardRelation : relatedCards) {
-        ExactCard relatedCard =
-            CardDatabaseManager::getInstance()->getCard({cardRelation->getName(), exactCard.getPrinting().getUuid()});
+        ExactCard relatedCard = CardDatabaseManager::getInstance()->getCardFromSameSet(cardRelation->getName(),
+                                                                                       card->getCard().getPrinting());
         if (!relatedCard) {
             relatedCard = CardDatabaseManager::getInstance()->getCard({cardRelation->getName()});
         }
@@ -4175,31 +4212,38 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu)
 
     if (createRelatedCards) {
         if (shortcutsActive) {
-            createRelatedCards->setShortcut(
-                SettingsCache::instance().shortcuts().getSingleShortcut("Player/aCreateRelatedTokens"));
+            createRelatedCards->setShortcuts(
+                SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens"));
         }
         connect(createRelatedCards, &QAction::triggered, this, &Player::actCreateAllRelatedCards);
         cardMenu->addAction(createRelatedCards);
     }
 }
 
-void Player::setCardMenu(QMenu *menu)
+/**
+ * Creates a card menu from the given card and sets it as the currently active card menu.
+ * Will first check if the card should have a card menu, and no-ops if not.
+ *
+ * @param card The card to create the menu for. Pass nullptr to disable the card menu.
+ * @return The new card menu, or nullptr if failed.
+ */
+QMenu *Player::updateCardMenu(const CardItem *card)
 {
-    if (aCardMenu != nullptr) {
-        aCardMenu->setEnabled(menu != nullptr);
-        if (menu) {
-            aCardMenu->setMenu(menu);
-        }
-    }
-}
-
-QMenu *Player::getCardMenu() const
-{
-    if (aCardMenu != nullptr) {
-        return aCardMenu->menu();
-    } else {
+    if (!card) {
+        emit cardMenuUpdated(nullptr);
         return nullptr;
     }
+
+    // If is spectator (as spectators don't need card menus), return
+    // only update the menu if the card is actually selected
+    if ((game->isSpectator() && !judge) || game->getActiveCard() != card) {
+        return nullptr;
+    }
+
+    QMenu *menu = createCardMenu(card);
+    emit cardMenuUpdated(menu);
+
+    return menu;
 }
 
 QString Player::getName() const
@@ -4271,7 +4315,9 @@ void Player::setLastToken(CardInfoPtr cardInfo)
                      .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
                      .pt = cardInfo->getPowTough(),
                      .annotation = SettingsCache::instance().getAnnotateTokens() ? cardInfo->getText() : "",
-                     .destroy = true};
+                     .destroy = true,
+                     .providerId =
+                         SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
 
     lastTokenTableRow = TableZone::clampValidTableRow(2 - cardInfo->getTableRow());
     aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(lastTokenInfo.name));
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 9062ac5b4..b4f901329 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -156,6 +156,7 @@ signals:
 
     void sizeChanged();
     void playerCountChanged();
+    void cardMenuUpdated(QMenu *cardMenu);
 public slots:
     void actUntapAll();
     void actRollDie();
@@ -239,7 +240,7 @@ private slots:
     void actSetAnnotation();
     void actReveal(QAction *action);
     void refreshShortcuts();
-
+    void actSortHand();
     void initSayMenu();
 
 public:
@@ -271,12 +272,11 @@ private:
         *aMoveBottomToPlayFaceDown, *aMoveBottomCardToTop, *aMoveBottomCardToGraveyard, *aMoveBottomCardToExile,
         *aMoveBottomCardsToGraveyard, *aMoveBottomCardsToExile, *aDrawBottomCard, *aDrawBottomCards;
 
-    QAction *aCardMenu;
     QList<QAction *> aAddCounter, aSetCounter, aRemoveCounter;
     QAction *aPlay, *aPlayFacedown, *aHide, *aTap, *aDoesntUntap, *aAttach, *aUnattach, *aDrawArrow, *aSetPT, *aResetPT,
         *aIncP, *aDecP, *aIncT, *aDecT, *aIncPT, *aDecPT, *aFlowP, *aFlowT, *aSetAnnotation, *aFlip, *aPeek, *aClone,
         *aMoveToTopLibrary, *aMoveToBottomLibrary, *aMoveToHand, *aMoveToGraveyard, *aMoveToExile,
-        *aMoveToXfromTopOfLibrary, *aSelectAll, *aSelectRow, *aSelectColumn;
+        *aMoveToXfromTopOfLibrary, *aSelectAll, *aSelectRow, *aSelectColumn, *aSortHand, *aIncrementAllCardCounters;
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
@@ -326,6 +326,8 @@ private:
                            const QString &avalue,
                            bool allCards,
                            EventProcessingOptions options);
+    QMenu *createMoveMenu() const;
+    QMenu *createPtMenu() const;
     void addRelatedCardActions(const CardItem *card, QMenu *cardMenu);
     void addRelatedCardView(const CardItem *card, QMenu *cardMenu);
     void createCard(const CardItem *sourceCard,
@@ -420,6 +422,7 @@ public:
     AbstractCounter *addCounter(int counterId, const QString &name, QColor color, int radius, int value);
     void delCounter(int counterId);
     void clearCounters();
+    void incrementAllCardCounters();
 
     ArrowItem *addArrow(const ServerInfo_Arrow &arrow);
     ArrowItem *addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color);
@@ -483,9 +486,8 @@ public:
     {
         return arrows;
     }
-    void setCardMenu(QMenu *menu);
-    QMenu *getCardMenu() const;
-    void updateCardMenu(const CardItem *card);
+    QMenu *updateCardMenu(const CardItem *card);
+    QMenu *createCardMenu(const CardItem *card);
     bool getActive() const
     {
         return active;
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index a5901c392..dc7489dce 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,10 +1,10 @@
 #include "player_list_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_game.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../client/ui/pixel_map_generator.h"
+#include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
index d645a299e..2d6947c9d 100644
--- a/cockatrice/src/game/zones/hand_zone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -127,6 +127,15 @@ void HandZone::reorganizeCards()
     update();
 }
 
+void HandZone::sortHand()
+{
+    if (cards.isEmpty()) {
+        return;
+    }
+    cards.sortBy({CardList::SortByMainType, CardList::SortByManaValue, CardList::SortByColorGrouping});
+    reorganizeCards();
+}
+
 void HandZone::setWidth(qreal _width)
 {
     if (SettingsCache::instance().getHorizontalHand()) {
diff --git a/cockatrice/src/game/zones/hand_zone.h b/cockatrice/src/game/zones/hand_zone.h
index 8189c7087..3fd55b20b 100644
--- a/cockatrice/src/game/zones/hand_zone.h
+++ b/cockatrice/src/game/zones/hand_zone.h
@@ -19,6 +19,7 @@ public:
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void reorganizeCards() override;
+    void sortHand();
     void setWidth(qreal _width);
 
 protected:
diff --git a/cockatrice/src/client/game_logic/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp
similarity index 99%
rename from cockatrice/src/client/game_logic/abstract_client.cpp
rename to cockatrice/src/server/abstract_client.cpp
index bc227bf68..4f3098871 100644
--- a/cockatrice/src/client/game_logic/abstract_client.cpp
+++ b/cockatrice/src/server/abstract_client.cpp
@@ -1,6 +1,5 @@
 #include "abstract_client.h"
 
-#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -18,6 +17,7 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
+#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 
diff --git a/cockatrice/src/client/game_logic/abstract_client.h b/cockatrice/src/server/abstract_client.h
similarity index 100%
rename from cockatrice/src/client/game_logic/abstract_client.h
rename to cockatrice/src/server/abstract_client.h
diff --git a/cockatrice/src/server/local_client.h b/cockatrice/src/server/local_client.h
index 679d43f2b..145887ea8 100644
--- a/cockatrice/src/server/local_client.h
+++ b/cockatrice/src/server/local_client.h
@@ -1,7 +1,7 @@
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
 
-#include "../client/game_logic/abstract_client.h"
+#include "abstract_client.h"
 
 #include <QLoggingCategory>
 
diff --git a/cockatrice/src/server/remote/remote_client.h b/cockatrice/src/server/remote/remote_client.h
index f34fdb71b..0ab24c798 100644
--- a/cockatrice/src/server/remote/remote_client.h
+++ b/cockatrice/src/server/remote/remote_client.h
@@ -1,7 +1,7 @@
 #ifndef REMOTECLIENT_H
 #define REMOTECLIENT_H
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "pb/commands.pb.h"
 
 #include <QLoggingCategory>
diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
index 0e6872646..dfed741f9 100644
--- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
@@ -1,6 +1,6 @@
 #include "remote_decklist_tree_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/command_deck_list.pb.h"
 #include "pb/response_deck_list.pb.h"
diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
index 953d1e6af..1fa72b20c 100644
--- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,6 +1,6 @@
 #include "remote_replay_list_tree_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/command_replay_list.pb.h"
 #include "pb/response_replay_list.pb.h"
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index a33b31632..86fa4a8bf 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -1,10 +1,10 @@
 #include "user_context_menu.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_game.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../game/game_selector.h"
+#include "../abstract_client.h"
 #include "../chat_view/chat_view.h"
 #include "../pending_command.h"
 #include "pb/command_kick_from_game.pb.h"
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index 39babbf50..65868927f 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,11 +1,11 @@
 #include "user_info_box.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/get_text_with_max.h"
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
 #include "../../dialogs/dlg_edit_user.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "passwordhasher.h"
 #include "pb/response_get_user_info.pb.h"
diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp
index 6cf0c763d..c74706955 100644
--- a/cockatrice/src/server/user/user_list_manager.cpp
+++ b/cockatrice/src/server/user/user_list_manager.cpp
@@ -1,7 +1,7 @@
 #include "user_list_manager.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/sound_engine.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"
diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp
index b1bc4dab7..b960d86ca 100644
--- a/cockatrice/src/server/user/user_list_widget.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,11 +1,11 @@
 #include "user_list_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../game/game_selector.h"
 #include "../../server/user/user_list_manager.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_get_games_of_user.pb.h"
diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp
index 2ad735128..6bfe04e2f 100644
--- a/cockatrice/src/settings/cache_settings.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -355,6 +355,7 @@ SettingsCache::SettingsCache()
     spectatorsCanSeeEverything = settings->value("game/spectatorscanseeeverything", false).toBool();
     createGameAsSpectator = settings->value("game/creategameasspectator", false).toBool();
     defaultStartingLifeTotal = settings->value("game/defaultstartinglifetotal", 20).toInt();
+    shareDecklistsOnLoad = settings->value("game/sharedecklistsonload", false).toBool();
     rememberGameSettings = settings->value("game/remembergamesettings", true).toBool();
     clientID = settings->value("personal/clientid", CLIENT_INFO_NOT_SET).toString();
     clientVersion = settings->value("personal/clientversion", CLIENT_INFO_NOT_SET).toString();
@@ -1360,7 +1361,13 @@ void SettingsCache::setDefaultStartingLifeTotal(const int _defaultStartingLifeTo
 {
     defaultStartingLifeTotal = _defaultStartingLifeTotal;
     settings->setValue("game/defaultstartinglifetotal", defaultStartingLifeTotal);
-};
+}
+
+void SettingsCache::setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad)
+{
+    shareDecklistsOnLoad = _shareDecklistsOnLoad;
+    settings->setValue("game/sharedecklistsonload", shareDecklistsOnLoad);
+}
 
 void SettingsCache::setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value)
 {
@@ -1373,6 +1380,7 @@ void SettingsCache::setStartupCardUpdateCheckPromptForUpdate(bool value)
     startupCardUpdateCheckPromptForUpdate = value;
     settings->setValue("personal/startupCardUpdateCheckPromptForUpdate", startupCardUpdateCheckPromptForUpdate);
 }
+
 void SettingsCache::setStartupCardUpdateCheckAlwaysUpdate(bool value)
 {
     startupCardUpdateCheckAlwaysUpdate = value;
diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h
index 16822d755..ec8b506c5 100644
--- a/cockatrice/src/settings/cache_settings.h
+++ b/cockatrice/src/settings/cache_settings.h
@@ -302,6 +302,7 @@ private:
     bool spectatorsCanSeeEverything;
     bool createGameAsSpectator;
     int defaultStartingLifeTotal;
+    bool shareDecklistsOnLoad;
     int keepalive;
     int timeout;
     void translateLegacySettings();
@@ -805,6 +806,10 @@ public:
     {
         return defaultStartingLifeTotal;
     }
+    bool getShareDecklistsOnLoad() const
+    {
+        return shareDecklistsOnLoad;
+    }
     bool getCreateGameAsSpectator() const
     {
         return createGameAsSpectator;
@@ -1032,6 +1037,7 @@ public slots:
     void setSpectatorsCanSeeEverything(const bool _spectatorsCanSeeEverything);
     void setCreateGameAsSpectator(const bool _createGameAsSpectator);
     void setDefaultStartingLifeTotal(const int _defaultStartingLifeTotal);
+    void setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad);
     void setRememberGameSettings(const bool _rememberGameSettings);
     void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value);
     void setStartupCardUpdateCheckPromptForUpdate(bool value);
diff --git a/cockatrice/src/settings/game_filters_settings.cpp b/cockatrice/src/settings/game_filters_settings.cpp
index 041a9a74a..e82b18a47 100644
--- a/cockatrice/src/settings/game_filters_settings.cpp
+++ b/cockatrice/src/settings/game_filters_settings.cpp
@@ -83,6 +83,17 @@ bool GameFiltersSettings::isHideNotBuddyCreatedGames()
     return !(previous == QVariant()) && previous.toBool();
 }
 
+void GameFiltersSettings::setHideOpenDecklistGames(bool hide)
+{
+    setValue(hide, "hide_open_decklist_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideOpenDecklistGames()
+{
+    QVariant previous = getValue("hide_open_decklist_games", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
 void GameFiltersSettings::setGameNameFilter(QString gameName)
 {
     setValue(gameName, "game_name_filter", "filter_games");
diff --git a/cockatrice/src/settings/game_filters_settings.h b/cockatrice/src/settings/game_filters_settings.h
index 8ab7d8e5e..a243c74e9 100644
--- a/cockatrice/src/settings/game_filters_settings.h
+++ b/cockatrice/src/settings/game_filters_settings.h
@@ -15,6 +15,8 @@ public:
     bool isHidePasswordProtectedGames();
     bool isHideIgnoredUserGames();
     bool isHideNotBuddyCreatedGames();
+    void setHideOpenDecklistGames(bool hide);
+    bool isHideOpenDecklistGames();
     QString getGameNameFilter();
     QString getCreatorNameFilter();
     int getMinPlayers();
diff --git a/cockatrice/src/settings/shortcuts_settings.cpp b/cockatrice/src/settings/shortcuts_settings.cpp
index db5559d8f..53c6f6a23 100644
--- a/cockatrice/src/settings/shortcuts_settings.cpp
+++ b/cockatrice/src/settings/shortcuts_settings.cpp
@@ -115,6 +115,13 @@ ShortcutKey ShortcutsSettings::getShortcut(const QString &name) const
     return getDefaultShortcut(name);
 }
 
+/**
+ * Gets the first shortcut for the given action.
+ *
+ * NOTE: In most cases you should be using ShortcutsSettings::getShortcut instead,
+ * as that will return all shortcuts if there are multiple shortcuts.
+ * The only reason to use this method is if an object does not accept multiple shortcuts, such as with QButtons.
+ */
 QKeySequence ShortcutsSettings::getSingleShortcut(const QString &name) const
 {
     return getShortcut(name).at(0);
diff --git a/cockatrice/src/settings/shortcuts_settings.h b/cockatrice/src/settings/shortcuts_settings.h
index 039c6ca8e..fdf422783 100644
--- a/cockatrice/src/settings/shortcuts_settings.h
+++ b/cockatrice/src/settings/shortcuts_settings.h
@@ -413,6 +413,10 @@ private:
         {"Player/aSetCounter_storm", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set Other Counters..."),
                                                  parseSequenceString("Ctrl+\\"),
                                                  ShortcutGroup::Player_Counters)},
+        {"Player/aIncrementAllCardCounters",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Increment all card counters"),
+                     parseSequenceString("Ctrl+Shift+A"),
+                     ShortcutGroup::Playing_Area)},
         {"Player/aIncP", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add Power (+1/+0)"),
                                      parseSequenceString("Ctrl++;Ctrl+="),
                                      ShortcutGroup::Power_Toughness)},
@@ -552,6 +556,9 @@ private:
                                      ShortcutGroup::Move_selected)},
         {"Player/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
+        {"Player/aSortHand", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand"),
+                                         parseSequenceString("Ctrl+Shift+H"),
+                                         ShortcutGroup::View)},
         {"Player/aViewGraveyard",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), parseSequenceString("F4"), ShortcutGroup::View)},
         {"Player/aViewLibrary",
diff --git a/cockatrice/src/client/game_logic/key_signals.cpp b/cockatrice/src/utility/key_signals.cpp
similarity index 100%
rename from cockatrice/src/client/game_logic/key_signals.cpp
rename to cockatrice/src/utility/key_signals.cpp
diff --git a/cockatrice/src/client/game_logic/key_signals.h b/cockatrice/src/utility/key_signals.h
similarity index 100%
rename from cockatrice/src/client/game_logic/key_signals.h
rename to cockatrice/src/utility/key_signals.h
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index f7e0f31a0..fb3acce32 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -25,12 +25,12 @@
     <message>
         <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Rafraîchir</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
+        <translation>Analyser le nom et le numéro de l&apos;extension (si disponibles)</translation>
     </message>
 </context>
 <context>
@@ -38,18 +38,19 @@
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir dans un nouvel onglet</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous sûr ?</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
-        <translation type="unfinished"/>
+        <translation>La liste de deck a été modifiée.
+Voulez-vous enregistrer les modifications ?</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
@@ -60,44 +61,45 @@ Do you want to save the changes?</source>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
+        <translation>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
-        <translation type="unfinished"/>
+        <translation>N&apos;a pas pu sauvegarder le deck distant</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
-        <translation type="unfinished"/>
+        <translation>Le deck n&apos;a pas pu être enregistré.
+Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
-        <translation type="unfinished"/>
+        <translation>Sauvegarder le deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
-        <translation type="unfinished"/>
+        <translation>Le deck n&apos;a pas pu être enregistré.</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
-        <translation type="unfinished"/>
+        <translation>Il n&apos;y a pas de cartes dans le deck à exporter</translation>
     </message>
     <message>
         <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>No deck was selected to be exported.</source>
-        <translation type="unfinished"/>
+        <translation>Aucun deck n&apos;a été sélectionné pour être exporté.</translation>
     </message>
 </context>
 <context>
@@ -105,12 +107,12 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
-        <translation type="unfinished"/>
+        <translation>Notes de mises à jour</translation>
     </message>
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
-        <translation type="unfinished"/>
+        <translation>Notes d&apos;administrateur pour %1</translation>
     </message>
 </context>
 <context>
@@ -118,12 +120,12 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
-        <translation type="unfinished"/>
+        <translation>Deck principal</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Réserve</translation>
     </message>
 </context>
 <context>
@@ -161,7 +163,7 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
-        <translation type="unfinished"/>
+        <translation>Montrer les raccourcis clavier dans les menus clic-droit</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="663"/>
@@ -176,17 +178,17 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
-        <translation type="unfinished"/>
+        <translation>Rotation automatique des cartes avec disposition horizontale</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
         <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
-        <translation type="unfinished"/>
+        <translation>Remplacer toutes les illustrations de cartes par les préférences personnelles (comportement avant modification du ProviderID) [Nécessite le redémarrage du client]</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation type="unfinished"/>
+        <translation>Mettre en avant que ce deck contient des cartes depuis le sommet, dans le sélecteur d&apos;impression</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="671"/>
@@ -196,38 +198,38 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="672"/>
         <source>Use rounded card corners</source>
-        <translation type="unfinished"/>
+        <translation>Utiliser des bords de cartes arrondis</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="674"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
-        <translation type="unfinished"/>
+        <translation>Pourcentage minimum de chevauchement des cartes dans la pile et dans la main verticale</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="675"/>
         <source>Maximum initial height for card view window:</source>
-        <translation type="unfinished"/>
+        <translation>Hauteur initiale maximale pour la fenêtre d&apos;affichage des cartes :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="676"/>
         <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
-        <translation type="unfinished"/>
+        <translation>lignes</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <source>Maximum expanded height for card view window:</source>
-        <translation type="unfinished"/>
+        <translation>Hauteur étendue maximale pour la fenêtre d&apos;affichage des cartes :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation type="unfinished"/>
+        <translation>Marqueurs sur la carte</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
-        <translation type="unfinished"/>
+        <translation>Marqueur %1</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
@@ -523,12 +525,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>Type principal</translation>
     </message>
     <message>
         <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation type="unfinished"/>
+        <translation>Sous-type</translation>
     </message>
 </context>
 <context>
@@ -546,12 +548,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
-        <translation type="unfinished"/>
+        <translation>Les deux</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
-        <translation type="unfinished"/>
+        <translation>Voir la transformation</translation>
     </message>
 </context>
 <context>
@@ -559,22 +561,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <source>View related cards</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes associées</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter la carte au deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
-        <translation type="unfinished"/>
+        <translation>Deck principal</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Réserve</translation>
     </message>
 </context>
 <context>
@@ -587,12 +589,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
-        <translation type="unfinished"/>
+        <translation>Cartes associées :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
-        <translation type="unfinished"/>
+        <translation>Carte inconnue :</translation>
     </message>
 </context>
 <context>
@@ -742,13 +744,13 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
         <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>leur zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/game/zones/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>La zone personnalisée &apos;%2&apos; de %1</translation>
     </message>
 </context>
 <context>
@@ -756,7 +758,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
+        <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
 </context>
 <context>
@@ -764,7 +766,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
+        <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
 </context>
 <context>
@@ -772,7 +774,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
-        <translation type="unfinished"/>
+        <translation>Infos de la carte</translation>
     </message>
 </context>
 <context>
@@ -780,47 +782,47 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter au deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter à la réserve</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
-        <translation type="unfinished"/>
+        <translation>Choisir l&apos;impression</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
         <source>Show on EDHREC (Commander)</source>
-        <translation type="unfinished"/>
+        <translation>Afficher sur EDHREC (Commandant)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
         <source>Show on EDHREC (Card)</source>
-        <translation type="unfinished"/>
+        <translation>Afficher sur EDHREC (carte)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
-        <translation type="unfinished"/>
+        <translation>Afficher les cartes associées</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter la carte au &amp;deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter carte à la ré&amp;serve</translation>
     </message>
 </context>
 <context>
@@ -828,87 +830,87 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <source>Banner Card</source>
-        <translation type="unfinished"/>
+        <translation>Carte bannière</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>Type principal</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
-        <translation type="unfinished"/>
+        <translation>Coût de mana</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
-        <translation type="unfinished"/>
+        <translation>Couleurs</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
-        <translation type="unfinished"/>
+        <translation>Choisir l&apos;impression</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
-        <translation type="unfinished"/>
+        <translation>Deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Nom du deck :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres de visibilité de la carte bannière et des étiquettes</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
+        <translation>Montrer le menu de sélection de carte bannière</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
+        <translation>Montrer le menu de sélection d&apos;étiquettes</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Commentaires :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
-        <translation type="unfinished"/>
+        <translation>Grouper par :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
-        <translation type="unfinished"/>
+        <translation>Empreinte :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
-        <translation type="unfinished"/>
+        <translation>Augmenter quant&amp;ité</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Diminuer quantité</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Retirer la ligne</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Échanger la carte vers/depuis la réserve</translation>
     </message>
 </context>
 <context>
@@ -916,17 +918,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
-        <translation type="unfinished"/>
+        <translation>Filtres</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Effacer tous les filtres</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
-        <translation type="unfinished"/>
+        <translation>Enlever la sélection</translation>
     </message>
 </context>
 <context>
@@ -934,109 +936,109 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Éditeur de deck</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Nouveau deck</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Charger un deck...</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
-        <translation type="unfinished"/>
+        <translation>Charger un deck récent...</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
-        <translation type="unfinished"/>
+        <translation>Effacer</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sauvegarder le deck</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
-        <translation type="unfinished"/>
+        <translation>S&amp;auvegarder le deck sous...</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
-        <translation type="unfinished"/>
+        <translation>Charger un deck depuis le presse-pap&amp;ier...</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Avec annotations</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Sans annotation</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Copier le deck dans le presse-papier</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
+        <translation>Annoté (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
+        <translation>Pas annoté (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
-        <translation type="unfinished"/>
+        <translation>Im&amp;primer le deck...</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
-        <translation type="unfinished"/>
+        <translation>Envoyer le deck au service en &amp;ligne</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
-        <translation type="unfinished"/>
+        <translation>Créer une liste de deck (decklist.org)</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
-        <translation type="unfinished"/>
+        <translation>Créer une liste de deck (decklist.xyz)</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Analyser le deck sur deckstats.net</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
-        <translation type="unfinished"/>
+        <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
         <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Fermer</translation>
     </message>
 </context>
 <context>
@@ -1044,7 +1046,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
-        <translation type="unfinished"/>
+        <translation>Sélection d&apos;impression</translation>
     </message>
 </context>
 <context>
@@ -1101,22 +1103,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
+        <translation>Taille du cache du réseau :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
+        <translation>Rediriger le TTL du cache :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
+        <translation>Combien de temps les redirections mises en cache pour les URL sont-elles valides.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
+        <translation>Taille du cache des images :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
@@ -1219,12 +1221,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
-        <translation type="unfinished"/>
+        <translation>Compter</translation>
     </message>
     <message>
         <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
-        <translation type="unfinished"/>
+        <translation>Édition</translation>
     </message>
     <message>
         <location filename="src/deck/deck_list_model.cpp" line="205"/>
@@ -1234,7 +1236,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <source>Provider ID</source>
-        <translation type="unfinished"/>
+        <translation>Provider ID</translation>
     </message>
     <message>
         <location filename="src/deck/deck_list_model.cpp" line="201"/>
@@ -1247,12 +1249,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Formats de decks courants (%1)</translation>
     </message>
     <message>
         <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
-        <translation type="unfinished"/>
+        <translation>Tous les fichiers (*.*)</translation>
     </message>
 </context>
 <context>
@@ -1260,17 +1262,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Mode de filtre par identité de couleur (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
 </context>
 <context>
@@ -1278,7 +1280,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
-        <translation type="unfinished"/>
+        <translation>Éditer les étiquettes...</translation>
     </message>
 </context>
 <context>
@@ -1286,62 +1288,62 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
-        <translation type="unfinished"/>
+        <translation>Gestionnaire d&apos;étiquettes de decks</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation type="unfinished"/>
+        <translation>Gérer vos étiquettes de decks. Ajouter ou retirer les étiquettes comme nécessaire, ou en créer de nouveaux :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter une nouvelle étiquette (e.g., Elfes)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter Étiquette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer les étiquettes...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
-        <translation type="unfinished"/>
+        <translation>Éditer les étiquettes par défaut</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
-        <translation type="unfinished"/>
+        <translation>Entrée invalide</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
+        <translation>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
+        <translation>Étiquette dupliquée</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
-        <translation type="unfinished"/>
+        <translation>Cette étiquette existe déjà.</translation>
     </message>
 </context>
 <context>
@@ -1349,94 +1351,94 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
-        <translation type="unfinished"/>
+        <translation>Carte bannière</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <source>Open in deck editor</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir dans l&apos;éditeur de deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
-        <translation type="unfinished"/>
+        <translation>Éditer les étiquettes</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <source>Save Deck to Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Copier le deck dans le presse-papier</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Avec annotations</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
+        <translation>Avec annotations (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Sans annotation</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
+        <translation>Sans annotation (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le fichier</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
-        <translation type="unfinished"/>
+        <translation>Supprimer le fichier</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <source>Set Banner Card</source>
-        <translation type="unfinished"/>
+        <translation>Choisir la carte bannière</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
-        <translation type="unfinished"/>
+        <translation>Nouveau nom :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <source>Rename failed</source>
-        <translation type="unfinished"/>
+        <translation>Renommage échoué</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
-        <translation type="unfinished"/>
+        <translation>Supprimer le fichier</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous certain de vouloir supprimer le fichier sélectionné ?</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
-        <translation type="unfinished"/>
+        <translation>Suppression échouée</translation>
     </message>
 </context>
 <context>
@@ -1468,13 +1470,13 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
+        <translation>Charger depuis le presse-papier...</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
         <source>Unload deck</source>
         <oldsource>Unload deck...</oldsource>
-        <translation type="unfinished"/>
+        <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
@@ -1484,7 +1486,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
-        <translation type="unfinished"/>
+        <translation>Forcer le démarrage</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
@@ -1510,18 +1512,19 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
+        <translation>Le deck est plus grand que la taille maximum de fichier.</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="329"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous sûr de vouloir forcer le démarrage ?
+Cela va éjecter de la partie tous les joueurs non prêts à démarrer.</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="331"/>
         <source>Cockatrice</source>
-        <translation type="unfinished"/>
+        <translation>Cockatrice</translation>
     </message>
 </context>
 <context>
@@ -1529,19 +1532,21 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
-        <translation type="unfinished"/>
+        <translation>Conversion de format de deck</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
-        <translation type="unfinished"/>
+        <translation>Vous avez essayé d&apos;ajouter une étiquette à un deck au format .txt.
+Les étiquettes ne peuvent être ajoutées qu&apos;aux decks au format .cod.
+Voulez-vous convertir le deck au format .cod ?</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
-        <translation type="unfinished"/>
+        <translation>Mémoriser et appliquer automatiquement le choix à l&apos;avenir</translation>
     </message>
 </context>
 <context>
@@ -1559,7 +1564,7 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
-        <translation type="unfinished"/>
+        <translation>Supprimer le serveur enregistré actuellement sélectionné</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
@@ -1630,7 +1635,7 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
-        <translation type="unfinished"/>
+        <translation>Mot de passe oublié ?</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
@@ -1773,12 +1778,12 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
-        <translation type="unfinished"/>
+        <translation>Total initial de point de vie</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
-        <translation type="unfinished"/>
+        <translation>Options de configuration de la partie</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
@@ -1876,7 +1881,7 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
+        <translation>Créer face-cachée (cache seulement le nom)</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
@@ -1909,53 +1914,53 @@ This will kick all non-ready players from the game.</source>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation type="unfinished"/>
+        <translation>Éditer les étiquettes</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation type="unfinished"/>
+        <translation>Confirmer</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation type="unfinished"/>
+        <translation>Entrer une étiquette et valider avec Entrée</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
-        <translation type="unfinished"/>
+        <translation>✖</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
-        <translation type="unfinished"/>
+        <translation>Entrée invalide</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
+        <translation>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
+        <translation>Étiquette dupliquée</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation type="unfinished"/>
+        <translation>Cette étiquette existe déjà.</translation>
     </message>
 </context>
 <context>
@@ -2004,17 +2009,17 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
     <message>
         <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
-        <translation type="unfinished"/>
+        <translation>Liste de deck invalide.</translation>
     </message>
 </context>
 <context>
@@ -2215,32 +2220,32 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas afficher les parties « amis uniquement »</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
-        <translation type="unfinished"/>
+        <translation>Cacher les parties pleines</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
-        <translation type="unfinished"/>
+        <translation>Cacher les parties qui ont commencées</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
-        <translation type="unfinished"/>
+        <translation>Cacher les parties protégées par un mot de passe</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
-        <translation type="unfinished"/>
+        <translation>Cacher les parties des utilisateurs ignorés</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
         <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
+        <translation>Cacher les parties non créées par des amis.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
@@ -2501,7 +2506,7 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
     <message>
         <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
-        <translation type="unfinished"/>
+        <translation>Charger un deck</translation>
     </message>
 </context>
 <context>
@@ -2535,37 +2540,37 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <source>Card name (or search expressions):</source>
-        <translation type="unfinished"/>
+        <translation>Nom de la carte (ou expression de recherche) :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de cartes trouvées :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
-        <translation type="unfinished"/>
+        <translation>Jouer les cartes trouvées automatiquement</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
-        <translation type="unfinished"/>
+        <translation>Placer la carte du dessus sur la pile jusqu&apos;à...</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation type="unfinished"/>
+        <translation>Aucune carte ne correspondant à l&apos;expression recherchée n&apos;existe dans la base de données de cartes. Continuer malgré tout ?</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
-        <translation type="unfinished"/>
+        <translation>Cockatrice</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
-        <translation type="unfinished"/>
+        <translation>Filtre invalide</translation>
     </message>
 </context>
 <context>
@@ -2683,27 +2688,27 @@ Your email will be used to verify your account.</source>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Cartes non modifiées :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Cartes modifiées :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
+        <translation>Cliquer sur des Extensions pour les activer. Glisser-et-déposer pour les réarranger et changer leur priorité. Les cartes utiliseront la version de l&apos;extension activée ayant la plus haut priorité.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
-        <translation type="unfinished"/>
+        <translation>Nettoyer toutes les informations sur les extensions</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
-        <translation type="unfinished"/>
+        <translation>Tout régler selon vos préférences</translation>
     </message>
 </context>
 <context>
@@ -2854,39 +2859,41 @@ Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation type="unfinished"/>
+        <translation>Vérification de la mise à jour des cartes</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
+        <translation>Cela fait plus de %2 jour(s) que vous n&apos;avez pas vérifié les mises à jour de votre base de données de cartes.
+Choisissez comment vous souhaitez exécuter le programme de mise à jour de la base de données de cartes.
+Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général » des paramètres.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation type="unfinished"/>
+        <translation>S&apos;exécuter en tâche principale</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation type="unfinished"/>
+        <translation>S&apos;exécuter en tâche de fond</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
+        <translation>S&apos;exécuter en tâche de fond, et toujours le faire à partir de maintenant</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas demander à nouveau et ne pas exécuter</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas exécuter cette fois</translation>
     </message>
 </context>
 <context>
@@ -2953,7 +2960,7 @@ Veuillez s&apos;il vous plaît visiter la page de téléchargement, pour mettre
         <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
         <oldsource>Downloading update...</oldsource>
-        <translation type="unfinished"/>
+        <translation>Téléchargement de la mise à jour : %1</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_update.cpp" line="109"/>
@@ -3031,13 +3038,14 @@ Veuillez s&apos;il vous plaît visiter la page de téléchargement, pour mettre
 You may have to manually download the new version.</source>
         <oldsource>Unfortunately there are no download packages available for your operating system. 
 You may have to build from source yourself.</oldsource>
-        <translation type="unfinished"/>
+        <translation>Malheureusement, la mise à jour automatique n&apos;a pas pu trouver un téléchargement compatible.
+Vous allez peut-être devoir télécharger manuellement la nouvelle version.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <source>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</source>
         <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
-        <translation type="unfinished"/>
+        <translation>Veuillez vérifier la &lt;a href=&quot;%1&quot;&gt;page &quot;releases&quot;&lt;/a&gt; sur notre Github et télécharger le programme pour votre système.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_update.cpp" line="208"/>
@@ -3087,7 +3095,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Charger vers le presse-papier</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
@@ -3100,12 +3108,12 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
-        <translation type="unfinished"/>
+        <translation>Dans %1 deck(s)</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
+        <translation>%1% de %2 deck(s)</translation>
     </message>
 </context>
 <context>
@@ -3113,47 +3121,47 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
-        <translation type="unfinished"/>
+        <translation>Card Hoarder</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation type="unfinished"/>
+        <translation>Card Kingdom</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation type="unfinished"/>
+        <translation>Card Market</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
-        <translation type="unfinished"/>
+        <translation>Face 2-Face</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
-        <translation type="unfinished"/>
+        <translation>Mana Pool</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
-        <translation type="unfinished"/>
+        <translation>MTG Stocks</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
-        <translation type="unfinished"/>
+        <translation>Scg</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
-        <translation type="unfinished"/>
+        <translation>Tcgl</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation type="unfinished"/>
+        <translation>Tcgplayer</translation>
     </message>
 </context>
 <context>
@@ -3161,7 +3169,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation type="unfinished"/>
+        <translation>%1% synergie</translation>
     </message>
 </context>
 <context>
@@ -3169,22 +3177,22 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
-        <translation type="unfinished"/>
+        <translation>Combos</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
-        <translation type="unfinished"/>
+        <translation>Deck moyen</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
         <source>Game Changers</source>
-        <translation type="unfinished"/>
+        <translation>Game Changers</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
         <source>Budget</source>
-        <translation type="unfinished"/>
+        <translation>Budget</translation>
     </message>
 </context>
 <context>
@@ -3192,7 +3200,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
-        <translation type="unfinished"/>
+        <translation>Sel :</translation>
     </message>
 </context>
 <context>
@@ -3208,22 +3216,22 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+        <translation>Confirmer la suppression</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous sûr de vouloir supprimer le filtre &apos;%1&apos; ?</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation type="unfinished"/>
+        <translation>Suppression échouée</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Échec de la suppression du filtre &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -3284,17 +3292,17 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
-        <translation type="unfinished"/>
+        <translation>Rejoindre la partie</translation>
     </message>
     <message>
         <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
-        <translation type="unfinished"/>
+        <translation>Rejoindre la partie comme spectateur</translation>
     </message>
     <message>
         <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
-        <translation type="unfinished"/>
+        <translation>Informations sur la partie</translation>
     </message>
     <message>
         <location filename="src/game/game_selector.cpp" line="304"/>
@@ -3494,7 +3502,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="370"/>
         <source>How to help with translations</source>
-        <translation type="unfinished"/>
+        <translation>Comment aider avec les traductions</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="371"/>
@@ -3504,7 +3512,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation type="unfinished"/>
+        <translation>Répertoire des filtres :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="373"/>
@@ -3539,37 +3547,37 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="379"/>
         <source>Check for client updates on startup</source>
-        <translation type="unfinished"/>
+        <translation>Vérifier les mises à jour du client au démarrage</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <source>Check for card database updates on startup</source>
-        <translation type="unfinished"/>
+        <translation>Vérifier les mises à jour de la base de données des cartes au démarrage...</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas vérifier</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="383"/>
         <source>Prompt for update</source>
-        <translation type="unfinished"/>
+        <translation>Confirmer les mises à jour</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation type="unfinished"/>
+        <translation>Toujours mettre à jour en tâche de fond</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="386"/>
         <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
+        <translation>Vérifier les mises à jour de la base de données des cartes tous les</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation type="unfinished"/>
+        <translation>jour(s)</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="388"/>
@@ -3589,7 +3597,7 @@ You may have to build from source yourself.</oldsource>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
+        <translation>Dernière vérification de mise à jour le %1 (il y a %2 jours)</translation>
     </message>
 </context>
 <context>
@@ -4006,7 +4014,7 @@ Cela veut généralement dire que votre client n&apos;est plus à jour, et que l
     <message>
         <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
+        <translation>La connexion au serveur a été perdue.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="586"/>
@@ -4152,12 +4160,12 @@ La version locale est %1, la nouvelle version est %2.</translation>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
-        <translation type="unfinished"/>
+        <translation>Recharger la base de cartes</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
-        <translation type="unfinished"/>
+        <translation>Onglets</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="692"/>
@@ -4187,12 +4195,12 @@ La version locale est %1, la nouvelle version est %2.</translation>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
+        <translation>Vérifier les mises à jour des cartes (automatiquement)</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
-        <translation type="unfinished"/>
+        <translation>Montrer la barre de statut</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="699"/>
@@ -4202,7 +4210,7 @@ La version locale est %1, la nouvelle version est %2.</translation>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir le dossier des paramètres</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="702"/>
@@ -4320,43 +4328,44 @@ Pour plus d&apos;informations sur la modification de l&apos;ordre des éditions,
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
-        <translation type="unfinished"/>
+        <translation>Une mise à jour de la base de données de cartes est en cours.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
-        <translation type="unfinished"/>
+        <translation>Échec au démarrage. Le fichier peut être manquant, ou les permissions sont incorrectes.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1289"/>
         <source>The process crashed some time after starting successfully.</source>
-        <translation type="unfinished"/>
+        <translation>Le processus a échoué quelque temps après avoir démarré avec succès.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1293"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
-        <translation type="unfinished"/>
+        <translation>Temps limite dépassé. Le processus a pris trop longtemps pour répondre. La dernière fonction waitFor...() a terminé.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1296"/>
         <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="unfinished"/>
+        <translation>Une erreur a eu lieu en essayant d&apos;écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal d&apos;entrée fermé.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1300"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
-        <translation type="unfinished"/>
+        <translation>Une erreur a eu lieu en essayant d&apos;écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal de sortie inactif.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Une erreur inconnue est arrivée.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>The card database updater exited with an error:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;outil de mise à jour de la base de données de cartes s&apos;est arrêté avec l&apos;erreur :
+%1</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1365"/>
@@ -4429,7 +4438,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
-        <translation type="unfinished"/>
+        <translation>Base de mana</translation>
     </message>
 </context>
 <context>
@@ -4438,7 +4447,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
-        <translation type="unfinished"/>
+        <translation>Courbe de mana</translation>
     </message>
 </context>
 <context>
@@ -4447,7 +4456,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
-        <translation type="unfinished"/>
+        <translation>Dévotion au mana</translation>
     </message>
 </context>
 <context>
@@ -4535,7 +4544,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation> depuis la zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="117"/>
@@ -4625,7 +4634,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="223"/>
         <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
+        <translation>%1 crée un jeton face-cachée.</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="225"/>
@@ -4715,7 +4724,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="329"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>%1 déplace %2%3 vers la zone personnalisée &apos;%4&apos;.</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="348"/>
@@ -4737,17 +4746,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
         <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <comment>top card for singular, top %3 cards for plural</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 regarde la %4 %3 carte %2.</numerusform><numerusform>%1 regarde les %4 %3 cartes %2.</numerusform><numerusform>%1 regarde la / les %4 %3 carte(s) %2.</numerusform></translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
-        <translation type="unfinished"/>
+        <translation>dessous</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
-        <translation type="unfinished"/>
+        <translation>dessus</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="377"/>
@@ -4934,12 +4943,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message numerus="yes">
         <location filename="src/server/message_log_widget.cpp" line="618"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 place %2 &quot;%3&quot; compteur sur %4 (désormais %5).</numerusform><numerusform>%1 place %2 &quot;%3&quot; compteurs sur %4 (désormais %5).</numerusform><numerusform>%1 place %2 &quot;%3&quot; compteur(s) sur %4 (désormais %5).</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="src/server/message_log_widget.cpp" line="620"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 retire %2 &quot;%3&quot; compteur sur %4 (désormais %5).</numerusform><numerusform>%1 retire %2 &quot;%3&quot; compteurs sur %4 (désormais %5).</numerusform><numerusform>%1 retire %2 &quot;%3&quot; compteur(s) sur %4 (désormais %5).</numerusform></translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="638"/>
@@ -5206,17 +5215,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
-        <translation type="unfinished"/>
+        <translation>Cartes à superposer :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
-        <translation type="unfinished"/>
+        <translation>Pourcentage de superposition :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
-        <translation type="unfinished"/>
+        <translation>Direction de superposition :</translation>
     </message>
 </context>
 <context>
@@ -5523,7 +5532,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="795"/>
         <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes du dessous de la bibliothèque...</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="797"/>
@@ -5533,23 +5542,23 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="810"/>
         <source>Shuffle</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="819"/>
         <source>Put top cards on stack &amp;until...</source>
         <oldsource>Take top cards &amp;until...</oldsource>
-        <translation type="unfinished"/>
+        <translation>Placer les cartes du dessus sur la pile j&amp;usqu&apos;à...</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="820"/>
         <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessus...</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="831"/>
         <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessous...</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="834"/>
@@ -5584,13 +5593,13 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="840"/>
         <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Zones personnalisés</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="843"/>
         <location filename="src/game/player/player.cpp" line="2806"/>
         <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Voir la zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="846"/>
@@ -5620,7 +5629,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="852"/>
         <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
+        <translation>Ma&amp;rqueurs sur la carte</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="860"/>
@@ -5641,12 +5650,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="871"/>
         <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
+        <translation>Sél&amp;ectionne une ligne</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="872"/>
         <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
+        <translation>Sél&amp;ectionne une colonne</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="874"/>
@@ -5778,7 +5787,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="913"/>
         <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessus de la bibliothèque dans un ordre aléatoire</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="914"/>
@@ -5798,17 +5807,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="1175"/>
         <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="1248"/>
         <source>Shuffle top cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="3188"/>
@@ -6013,12 +6022,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <source>Display Navigation Buttons</source>
-        <translation type="unfinished"/>
+        <translation>Afficher les boutons de navigation</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
         <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Attention :&lt;/b&gt; Vous semblez utiliser des illustrations de cartes personnalisées, qui présentent des bugs connus lorsque vous utilisez également le sélecteur d&apos;impression dans cette version de Cockatrice.</translation>
     </message>
 </context>
 <context>
@@ -6026,22 +6035,22 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <source>Preference</source>
-        <translation type="unfinished"/>
+        <translation>Préférence</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <source>Pin Printing</source>
-        <translation type="unfinished"/>
+        <translation>Épingler Imprimer</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <source>Unpin Printing</source>
-        <translation type="unfinished"/>
+        <translation>Désépingler Imprimer</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
-        <translation type="unfinished"/>
+        <translation>Afficher les cartes associées</translation>
     </message>
 </context>
 <context>
@@ -6049,7 +6058,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par nom d&apos;extension ou code d&apos;extension</translation>
     </message>
 </context>
 <context>
@@ -6057,17 +6066,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
-        <translation type="unfinished"/>
+        <translation>Carte précédente dans le deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
-        <translation type="unfinished"/>
+        <translation>Sélection groupée</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
-        <translation type="unfinished"/>
+        <translation>Carte suivante dans le deck</translation>
     </message>
 </context>
 <context>
@@ -6172,12 +6181,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
+        <translation>Écraser le fichier existant ?</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
+        <translation>Une version en fichier .cod existe déjà pour ce deck. L&apos;écraser ?</translation>
     </message>
 </context>
 <context>
@@ -6367,7 +6376,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
-        <translation type="unfinished"/>
+        <translation>Choisir une action de la table</translation>
     </message>
     <message>
         <location filename="src/utility/sequence_edit.cpp" line="51"/>
@@ -6382,7 +6391,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
-        <translation type="unfinished"/>
+        <translation>Raccourci déjà utilisé par :</translation>
     </message>
     <message>
         <location filename="src/utility/sequence_edit.cpp" line="217"/>
@@ -6469,12 +6478,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>Effacer tous les raccourcis</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par nom de raccourci</translation>
     </message>
 </context>
 <context>
@@ -6606,7 +6615,7 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
-        <translation type="unfinished"/>
+        <translation>Défaut</translation>
     </message>
     <message>
         <location filename="src/client/network/release_channel.cpp" line="120"/>
@@ -6634,17 +6643,17 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter à la liste d&apos;amis</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter à la liste noire</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Compte</translation>
     </message>
 </context>
 <context>
@@ -6677,27 +6686,27 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
-        <translation type="unfinished"/>
+        <translation>Fonctions de modérateur du serveur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
-        <translation type="unfinished"/>
+        <translation>Replay ID</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
-        <translation type="unfinished"/>
+        <translation>Accorder l&apos;accès au Replay</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
-        <translation type="unfinished"/>
+        <translation>Nom d&apos;utilisateur à activer</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
-        <translation type="unfinished"/>
+        <translation>Forcer l&apos;activation d&apos;un utilisateur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
@@ -6713,12 +6722,12 @@ Please check your shortcut settings!</source>
         <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
-        <translation type="unfinished"/>
+        <translation>Succès</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
-        <translation type="unfinished"/>
+        <translation>Accès au Replay accordé</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
@@ -6727,37 +6736,37 @@ Please check your shortcut settings!</source>
         <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation type="unfinished"/>
+        <translation>Incapable d&apos;accorder l&apos;accès au Replay. Le Replay ID est invalide.</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
-        <translation type="unfinished"/>
+        <translation>Incapable d&apos;accorder l&apos;accès au Replay. Erreur interne.</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
-        <translation type="unfinished"/>
+        <translation>Utilisateur activé avec succès</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
-        <translation type="unfinished"/>
+        <translation>Incapable d&apos;activer l&apos;utilisateur. Nom d&apos;utilisateur invalide</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
-        <translation type="unfinished"/>
+        <translation>Incapable d&apos;activer l&apos;utilisateur. Utilisateur déjà actif</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
-        <translation type="unfinished"/>
+        <translation>Incapable d&apos;activer l&apos;utilisateur. Erreur interne</translation>
     </message>
 </context>
 <context>
@@ -6819,45 +6828,45 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <source>Visual Deck: %1</source>
-        <translation type="unfinished"/>
+        <translation>Deck visuel : %1</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <source>&amp;Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Éditeur de deck visuel</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <source>Card Info</source>
-        <translation type="unfinished"/>
+        <translation>Infos de la carte</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <source>Deck</source>
-        <translation type="unfinished"/>
+        <translation>Deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <source>Filters</source>
-        <translation type="unfinished"/>
+        <translation>Filtres</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
         <source>Deck Analytics</source>
-        <translation type="unfinished"/>
+        <translation>Analyse de deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <source>Printing</source>
-        <translation type="unfinished"/>
+        <translation>Imprimer</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
@@ -6866,7 +6875,7 @@ Please check your shortcut settings!</source>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <source>Visible</source>
-        <translation type="unfinished"/>
+        <translation>Visible</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
@@ -6875,12 +6884,12 @@ Please check your shortcut settings!</source>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <source>Floating</source>
-        <translation type="unfinished"/>
+        <translation>Flottant</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
-        <translation type="unfinished"/>
+        <translation>Réinitialiser l&apos;interface</translation>
     </message>
 </context>
 <context>
@@ -6888,22 +6897,22 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
-        <translation type="unfinished"/>
+        <translation>Vue de deck visuel</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
-        <translation type="unfinished"/>
+        <translation>Analyse de deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
-        <translation type="unfinished"/>
+        <translation>Exemple de main</translation>
     </message>
 </context>
 <context>
@@ -6927,7 +6936,7 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le deck ou le dossier</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
@@ -6956,22 +6965,22 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir le dossier des decks</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le dossier local</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le fichier local</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
-        <translation type="unfinished"/>
+        <translation>Nouveau nom :</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
@@ -6984,7 +6993,7 @@ Please check your shortcut settings!</source>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
-        <translation type="unfinished"/>
+        <translation>Renommage échoué</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
@@ -7022,17 +7031,17 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Delete remote decks</source>
-        <translation type="unfinished"/>
+        <translation>Supprimer les decks dinstants</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Are you sure you want to delete the selected decks?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous certain de vouloir supprimer les decks sélectionnés ?</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
@@ -7043,7 +7052,7 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage de deck</translation>
     </message>
 </context>
 <context>
@@ -7051,17 +7060,17 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage visuel de deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
+        <translation>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
 </context>
 <context>
@@ -7069,7 +7078,7 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
-        <translation type="unfinished"/>
+        <translation>EDHREC :</translation>
     </message>
 </context>
 <context>
@@ -7077,32 +7086,32 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cartes</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
-        <translation type="unfinished"/>
+        <translation>Commandants populaires</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Étiquettes</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher une carte ...</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
         <source>EDHREC: </source>
-        <translation type="unfinished"/>
+        <translation>EDHREC :</translation>
     </message>
 </context>
 <context>
@@ -7197,7 +7206,7 @@ Veuillez entrer un nom:</translation>
     <message>
         <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <source>Un&amp;concede</source>
-        <translation type="unfinished"/>
+        <translation>Annuler la &amp;concession</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_game.cpp" line="253"/>
@@ -7539,7 +7548,7 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
-        <translation type="unfinished"/>
+        <translation>Renommer</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
@@ -7556,7 +7565,7 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir le dossier des Replays</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
@@ -7571,12 +7580,12 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le dossier local</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
-        <translation type="unfinished"/>
+        <translation>Renommer le fichier local</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
@@ -7586,12 +7595,12 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
-        <translation type="unfinished"/>
+        <translation>Renommage échoué</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
@@ -7621,7 +7630,7 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
-        <translation type="unfinished"/>
+        <translation>Replays de parties</translation>
     </message>
 </context>
 <context>
@@ -7713,57 +7722,57 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Éditeur de deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>EDHrec</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage &amp;visuel de decks</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
-        <translation type="unfinished"/>
+        <translation>Serveur</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Compte</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage de deck</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
-        <translation type="unfinished"/>
+        <translation>Replays de parties</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
-        <translation type="unfinished"/>
+        <translation>Administration</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
-        <translation type="unfinished"/>
+        <translation>Journaux</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
@@ -7846,7 +7855,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Affichage visuel de la base de données</translation>
     </message>
 </context>
 <context>
@@ -8016,7 +8025,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
-        <translation type="unfinished"/>
+        <translation>Voir les notes d&apos;administrateur</translation>
     </message>
     <message>
         <location filename="src/server/user/user_context_menu.cpp" line="107"/>
@@ -8070,7 +8079,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
-        <translation type="unfinished"/>
+        <translation>Impossible de récupérer les notes d&apos;administrateur.</translation>
     </message>
     <message>
         <location filename="src/server/user/user_context_menu.cpp" line="251"/>
@@ -8305,7 +8314,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="875"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cliquer joue toutes les cartes sélectionnées (à la place de seulement la carte cliquée)</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="876"/>
@@ -8315,12 +8324,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="877"/>
         <source>Close card view window when last card is removed</source>
-        <translation type="unfinished"/>
+        <translation>Fermer la fenêtre d&apos;affichage des cartes lorsque la dernière carte est supprimée</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="878"/>
         <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
+        <translation>Focalise automatiquement la barre de recherche lorsque la fenêtre d&apos;affichage des cartes est ouverte</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="879"/>
@@ -8365,67 +8374,67 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="887"/>
         <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres d&apos;éditeur et de stockage de deck</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <source>Open deck in new tab by default</source>
-        <translation type="unfinished"/>
+        <translation>Ouvre le deck dans un nouvel onglet par défaut</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="889"/>
         <source>Use visual deck storage in game lobby</source>
-        <translation type="unfinished"/>
+        <translation>Utiliser le stockage visuel de decks dans le lobby des parties</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Utilisez l&apos;animation de sélection pour le stockage visuel des deck</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
+        <translation>Lorsque vous ajoutez une étiquette dans le stockage visuel du deck à un deck stocké comme un fichier .txt :</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
-        <translation type="unfinished"/>
+        <translation>ne rien faire</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
+        <translation>demander à convertir en fichier .cod</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
-        <translation type="unfinished"/>
+        <translation>toujours convertir en fichier .cod</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <source>Default deck editor type</source>
-        <translation type="unfinished"/>
+        <translation>Type d&apos;éditeur de deck par défaut</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Éditeur de deck classique</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres du replay</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
-        <translation type="unfinished"/>
+        <translation>Temps de tampon pour les sauts en arrière via un raccourci :</translation>
     </message>
 </context>
 <context>
@@ -8433,22 +8442,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
-        <translation type="unfinished"/>
+        <translation>Joueurs connectés au serveur : %1</translation>
     </message>
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
-        <translation type="unfinished"/>
+        <translation>Joueurs dans ce salon : %1</translation>
     </message>
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
-        <translation type="unfinished"/>
+        <translation>Amis connectés : %1 / %2</translation>
     </message>
     <message>
         <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
-        <translation type="unfinished"/>
+        <translation>Joueurs sur liste noire connectés : %1 / %2</translation>
     </message>
 </context>
 <context>
@@ -8456,22 +8465,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
         <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure / exclure</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
 </context>
 <context>
@@ -8479,17 +8488,17 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
-        <translation type="unfinished"/>
+        <translation>Sauvegarder le filtre</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
+        <translation>Sauvegarder tous les filtres actuellement appliqués dans un fichier</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
-        <translation type="unfinished"/>
+        <translation>Entrer le nom du fichier...</translation>
     </message>
 </context>
 <context>
@@ -8497,22 +8506,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas afficher les types principaux de cartes dont le nombre est inférieur à ce montant dans la base de données</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure</translation>
     </message>
 </context>
 <context>
@@ -8520,27 +8529,27 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
         <source>Filter by name...</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer par nom...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
-        <translation type="unfinished"/>
+        <translation>Charger depuis un deck</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
+        <translation>Appliquer tous les noms de cartes du deck actuellement chargé comme filtres de nom exacts</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Charger depuis le presse-papier...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
+        <translation>Appliquer tous les noms de cartes du presse-papier comme filtres de nom exacts</translation>
     </message>
 </context>
 <context>
@@ -8548,7 +8557,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer par extensions récentes</translation>
     </message>
 </context>
 <context>
@@ -8556,19 +8565,19 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <source>Search sets...</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher les extensions...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure</translation>
     </message>
 </context>
 <context>
@@ -8576,27 +8585,27 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <source>Search subtypes...</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par sous-types...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
+        <translation>Ne pas afficher les sous-types de cartes dont le nombre est inférieur à ce montant dans la base de données</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Mode : inclure</translation>
     </message>
 </context>
 <context>
@@ -8604,32 +8613,32 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <source>Clear all filters</source>
-        <translation type="unfinished"/>
+        <translation>Effacer tous les filtres</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
         <source>Save and load filters</source>
-        <translation type="unfinished"/>
+        <translation>Sauvegarder et charger des filtres</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
         <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer par nom exact de carte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
         <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer par sous-type de carte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
         <source>Filter by set</source>
-        <translation type="unfinished"/>
+        <translation>Filtrer par extension</translation>
     </message>
 </context>
 <context>
@@ -8637,12 +8646,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
+        <translation>Piocher un nouvel exemple de main</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
-        <translation type="unfinished"/>
+        <translation>Taille de l&apos;exemple de main</translation>
     </message>
 </context>
 <context>
@@ -8650,38 +8659,38 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
         <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
+        <translation>Cliquer et glisser pour changer l&apos;ordre dans les groupes</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <source>Quick search and add card</source>
-        <translation type="unfinished"/>
+        <translation>Recherche et ajout rapide d&apos;une carte</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
+        <translation>Recherchez la correspondance la plus proche dans la base de données (avec suggestions automatiques) et ajoutez l&apos;impression souhaitée au deck en appuyant sur Entrée</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
         <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
+        <translation>Configurez le mode de tri des cartes dans leurs groupes.</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
         <source>Overlap Layout</source>
-        <translation type="unfinished"/>
+        <translation>Interface de superposition</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
         <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
+        <translation>Modifier l&apos;affichage des cartes dans les zones (i.e. superposées ou entièrement visibles).</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
         <source>Flat Layout</source>
-        <translation type="unfinished"/>
+        <translation>Interface plate</translation>
     </message>
 </context>
 <context>
@@ -8689,7 +8698,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage de deck</translation>
     </message>
 </context>
 <context>
@@ -8697,47 +8706,47 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <source>Show Folders</source>
-        <translation type="unfinished"/>
+        <translation>Montrer les dossiers</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <source>Show Tag Filter</source>
-        <translation type="unfinished"/>
+        <translation>Montrer le filtre à étiquette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <source>Show Tags On Deck Previews</source>
-        <translation type="unfinished"/>
+        <translation>Montrer les étiquettes sur les aperçus de decks</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <source>Show Banner Card Selection Option</source>
-        <translation type="unfinished"/>
+        <translation>Montrer l&apos;option de sélection de carte bannière</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <source>Draw unused Color Identities</source>
-        <translation type="unfinished"/>
+        <translation>Affiche les identités de couleurs non utilisées</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <source>Unused Color Identities Opacity</source>
-        <translation type="unfinished"/>
+        <translation>Opacité des identités de couleur inutilisées</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <source>Deck tooltip:</source>
-        <translation type="unfinished"/>
+        <translation>Aide contextuelle du deck :</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Aucun(e)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
-        <translation type="unfinished"/>
+        <translation>Chemin de fichier</translation>
     </message>
 </context>
 <context>
@@ -8745,7 +8754,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par chemin de fichier (ou expressions de recherche)</translation>
     </message>
 </context>
 <context>
@@ -8753,22 +8762,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
-        <translation type="unfinished"/>
+        <translation>Trier par ordre alphabétique (nom de deck)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
-        <translation type="unfinished"/>
+        <translation>Trier par ordre alphabétique (nom de fichier)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
-        <translation type="unfinished"/>
+        <translation>Trier par date de dernière modification</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
-        <translation type="unfinished"/>
+        <translation>Trier par date de dernier chargement</translation>
     </message>
 </context>
 <context>
@@ -8776,17 +8785,17 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
-        <translation type="unfinished"/>
+        <translation>Chargement de la base de données ...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
-        <translation type="unfinished"/>
+        <translation>Recharger les fichiers chargés</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres du stockage visuel des decks</translation>
     </message>
 </context>
 <context>
@@ -8919,7 +8928,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/dialogs/dlg_manage_sets.cpp" line="163"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
+        <translation>Inclure les cartes rééquilibrées pour Alchemy [nécessite un redémarrage]</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
@@ -8972,12 +8981,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
         <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
+        <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="219"/>
         <source>Ungrouped</source>
-        <translation type="unfinished"/>
+        <translation>Non groupé</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
@@ -8997,7 +9006,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Unsorted</source>
-        <translation type="unfinished"/>
+        <translation>Non trié</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
@@ -9022,12 +9031,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
         <source>Sort by P/T</source>
-        <translation type="unfinished"/>
+        <translation>Trier par F/E</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
         <source>Sort by Set</source>
-        <translation type="unfinished"/>
+        <translation>Trier par extension</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
@@ -9153,12 +9162,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
         <location filename="src/settings/shortcuts_settings.h" line="75"/>
         <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
-        <translation type="unfinished"/>
+        <translation>Replays</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
-        <translation type="unfinished"/>
+        <translation>Onglets</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="150"/>
@@ -9209,12 +9218,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
         <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
         <oldsource>Analyze Deck</oldsource>
-        <translation type="unfinished"/>
+        <translation>Analyser le deck (deckstats.net)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
-        <translation type="unfinished"/>
+        <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="186"/>
@@ -9249,12 +9258,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
-        <translation type="unfinished"/>
+        <translation>Exporter le deck (decklist.org)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
-        <translation type="unfinished"/>
+        <translation>Exporter le deck (decklist.xyz)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="211"/>
@@ -9275,12 +9284,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Éditer le deck dans le presse-papier, avec annotations</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="229"/>
@@ -9326,7 +9335,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
-        <translation type="unfinished"/>
+        <translation>Copier le deck, avec annotations (sans information d&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="260"/>
@@ -9336,7 +9345,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
-        <translation type="unfinished"/>
+        <translation>Copier le deck (sans information d&apos;extension)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="267"/>
@@ -9396,107 +9405,107 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
-        <translation type="unfinished"/>
+        <translation>Montrer la barre de statut</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
-        <translation type="unfinished"/>
+        <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
-        <translation type="unfinished"/>
+        <translation>Forcer le démarrage</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (F)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (F)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (F)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (E)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (E)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (E)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (D)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (D)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (D)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (C)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (C)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (C)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (B)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (B)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (B)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un marqueur de carte (A)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Retirer un marqueur de carte (A)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de marqueurs de carte (A)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="347"/>
@@ -9706,7 +9715,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
-        <translation type="unfinished"/>
+        <translation>Cache la carte dans la fenêtre Révéler</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="485"/>
@@ -9776,17 +9785,17 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Select All Cards in Zone</source>
-        <translation type="unfinished"/>
+        <translation>Sélectionne toutes les cartes dans la zone</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="527"/>
         <source>Select All Cards in Row</source>
-        <translation type="unfinished"/>
+        <translation>Sélectionne toutes les cartes dans la ligne</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
-        <translation type="unfinished"/>
+        <translation>Sélectionne toutes les cartes dans la colonne</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="533"/>
@@ -9852,7 +9861,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
-        <translation type="unfinished"/>
+        <translation>Cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="570"/>
@@ -9880,7 +9889,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
-        <translation type="unfinished"/>
+        <translation>Empiler jusqu&apos;à ce que trouvé</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="615"/>
@@ -9925,12 +9934,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <source>Shuffle Top Cards of Library</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="641"/>
         <source>Shuffle Bottom Cards of Library</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="644"/>
@@ -9995,22 +10004,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
-        <translation type="unfinished"/>
+        <translation>Avance en avant</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
-        <translation type="unfinished"/>
+        <translation>Avant en arrière</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <source>Skip Forward by a lot</source>
-        <translation type="unfinished"/>
+        <translation>Avance beaucoup en avant</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="692"/>
         <source>Skip Backward by a lot</source>
-        <translation type="unfinished"/>
+        <translation>Avance beaucoup en arrière</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="695"/>
@@ -10020,37 +10029,37 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
-        <translation type="unfinished"/>
+        <translation>Activer l&apos;avance rapide</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage visuel de deck</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Stockage de deck</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
-        <translation type="unfinished"/>
+        <translation>Serveur</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Compte</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
-        <translation type="unfinished"/>
+        <translation>Administration</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
-        <translation type="unfinished"/>
+        <translation>Journaux</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts
index f014d3ff2..915b5479e 100644
--- a/cockatrice/translations/cockatrice_it.ts
+++ b/cockatrice/translations/cockatrice_it.ts
@@ -224,17 +224,17 @@ Controlla se la cartella è valida e prova ancora.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation type="unfinished"/>
+        <translation>Segnalini della carta</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
-        <translation type="unfinished"/>
+        <translation>Segnalino %1</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
-        <translation>Layout della mano</translation>
+        <translation>Disposizione della mano</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
@@ -249,17 +249,17 @@ Controlla se la cartella è valida e prova ancora.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
-        <translation>Layout della griglia tabellare</translation>
+        <translation>Disposizione delle aree di gioco</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
-        <translation>Inverti le coordinate verticali</translation>
+        <translation>Inverti disposizione verticale</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <source>Minimum player count for multi-column layout:</source>
-        <translation>Numero di giocatori minimo per layout multicolonna:</translation>
+        <translation>Numero di giocatori minimo per disposizione multicolonna:</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
@@ -525,12 +525,12 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation type="unfinished"/>
+        <translation>Sottotipo</translation>
     </message>
 </context>
 <context>
@@ -744,13 +744,13 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
         <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la sua zona personalizzata &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/game/zones/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la zona personalizzata &apos;%2&apos; di %1</translation>
     </message>
 </context>
 <context>
@@ -758,7 +758,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
+        <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
 </context>
 <context>
@@ -766,7 +766,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
+        <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
 </context>
 <context>
@@ -835,17 +835,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
-        <translation type="unfinished"/>
+        <translation>Costo di mana</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
-        <translation type="unfinished"/>
+        <translation>Colori</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
@@ -865,17 +865,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
+        <translation>Impostazioni carta copertina/etichette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
+        <translation>Visualizza menu di selezione carta copertina</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
+        <translation>Visualizza menu di selezione etichette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
@@ -885,7 +885,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
-        <translation type="unfinished"/>
+        <translation>Raggruppa per:</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
@@ -1272,7 +1272,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Filtraggio identità di colore (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
 </context>
 <context>
@@ -1318,7 +1318,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
-        <translation type="unfinished"/>
+        <translation>Modifica etichette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
@@ -1470,7 +1470,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
+        <translation>Carica dagli appunti...</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
@@ -1512,18 +1512,19 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
+        <translation>Il mazzo è più grande della dimensione massima del file consentita.</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="329"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
+        <translation>Sicuro di voler forzare l&apos;avvio?
+Ciò espellerà dalla partita tutti i giocatori che non sono pronti.</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="331"/>
         <source>Cockatrice</source>
-        <translation type="unfinished"/>
+        <translation>Cockatrice</translation>
     </message>
 </context>
 <context>
@@ -1875,12 +1876,12 @@ Vuoi convertire il mazzo al formato .cod?</translation>
     <message>
         <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
-        <translation>&amp;Distruggi la pedina quando lascia il tavolo</translation>
+        <translation>&amp;Elimina la pedina quando lascia il campo</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
+        <translation>Crea a faccia in giù (nasconde solo il nome)</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
@@ -1913,53 +1914,53 @@ Vuoi convertire il mazzo al formato .cod?</translation>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation type="unfinished"/>
+        <translation>Modifica etichette</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation type="unfinished"/>
+        <translation>Conferma</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annulla</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation type="unfinished"/>
+        <translation>Scrivi il nome dell&apos;etichetta e premi Invio</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
-        <translation type="unfinished"/>
+        <translation>✖</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
-        <translation type="unfinished"/>
+        <translation>Input non valido</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
+        <translation>Il nome dell&apos;etichetta non può essere vuoto!</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
+        <translation>Duplica Etichetta</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation type="unfinished"/>
+        <translation>Questa etichetta esiste già.</translation>
     </message>
 </context>
 <context>
@@ -2244,7 +2245,7 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
         <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
+        <translation>Nascondi partite non create dagli amici</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
@@ -2688,27 +2689,27 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Carte non modificate:</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Carte modificate:</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
+        <translation>Seleziona i set per abilitarli. Trascina per riordinarli e modificare la loro priorità. Le carte useranno la stampa del set abilitato con la priorità massima.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
-        <translation type="unfinished"/>
+        <translation>Elimina tutte le info sui set</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
-        <translation type="unfinished"/>
+        <translation>Imposta tutti come preferiti</translation>
     </message>
 </context>
 <context>
@@ -2858,39 +2859,41 @@ Desideri modificare l&apos;impostazione della posizione del database?</translati
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation type="unfinished"/>
+        <translation>Controllo aggiornamenti carte</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
+        <translation>Sono passati più di %2 days giorni dall&apos;ultima volta che hai eseguito il controllo aggiornamenti delle carte.
+Seleziona la modalità di esecuzione dell&apos;aggiornamento.
+Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Generale&apos;.</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation type="unfinished"/>
+        <translation>Esegui in primo piano</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation type="unfinished"/>
+        <translation>Esegui in background</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
+        <translation>Esegui in background da ora in poi</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
+        <translation>Non eseguire e non chiedere più</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
+        <translation>Non eseguire stavolta</translation>
     </message>
 </context>
 <context>
@@ -3093,7 +3096,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Copia negli appunti</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
@@ -3106,12 +3109,12 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
-        <translation type="unfinished"/>
+        <translation>In %1 mazzi</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
+        <translation>%1% di %2 mazzi</translation>
     </message>
 </context>
 <context>
@@ -3119,47 +3122,47 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
-        <translation type="unfinished"/>
+        <translation>Card Hoarder</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation type="unfinished"/>
+        <translation>Card Kingdom</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation type="unfinished"/>
+        <translation>Card Market</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
-        <translation type="unfinished"/>
+        <translation>Face 2-Face</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
-        <translation type="unfinished"/>
+        <translation>Mana Pool</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
-        <translation type="unfinished"/>
+        <translation>MTG Stocks</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
-        <translation type="unfinished"/>
+        <translation>Scg</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
-        <translation type="unfinished"/>
+        <translation>Tcgl</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation type="unfinished"/>
+        <translation>Tcgplayer</translation>
     </message>
 </context>
 <context>
@@ -3167,7 +3170,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation type="unfinished"/>
+        <translation>Sinergia %1%</translation>
     </message>
 </context>
 <context>
@@ -3175,22 +3178,22 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
-        <translation type="unfinished"/>
+        <translation>Combo</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
-        <translation type="unfinished"/>
+        <translation>Mazzo medio</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
         <source>Game Changers</source>
-        <translation type="unfinished"/>
+        <translation>Game Changer</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
         <source>Budget</source>
-        <translation type="unfinished"/>
+        <translation>Budget</translation>
     </message>
 </context>
 <context>
@@ -3206,7 +3209,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
-        <translation>Scrivi qui il tuo filtro</translation>
+        <translation>Scrivi il filtro qui</translation>
     </message>
 </context>
 <context>
@@ -3214,22 +3217,22 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+        <translation>Conferma eliminazione</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
+        <translation>Vuoi davvero eliminare il filtro &apos;%1&apos;?</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation type="unfinished"/>
+        <translation>Eliminazione non riuscita</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Impossibile eliminare il filtro &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -3510,7 +3513,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation type="unfinished"/>
+        <translation>Cartella filtri:</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="373"/>
@@ -3550,32 +3553,32 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <source>Check for card database updates on startup</source>
-        <translation type="unfinished"/>
+        <translation>Controlla gli aggiornamenti delle carte all&apos;avvio</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
+        <translation>Non controllare</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="383"/>
         <source>Prompt for update</source>
-        <translation type="unfinished"/>
+        <translation>Chiedi se aggiornare</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation type="unfinished"/>
+        <translation>Aggiorna sempre in background</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="386"/>
         <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
+        <translation>Controlla gli aggiornamenti delle carte ogni</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation type="unfinished"/>
+        <translation>giorni</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="388"/>
@@ -3595,7 +3598,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
+        <translation>Ultimo controllo %1 (%2 giorni fa)</translation>
     </message>
 </context>
 <context>
@@ -4012,7 +4015,7 @@ Solitamente questo significa che stai usando una vecchia versione del programma,
     <message>
         <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
+        <translation>La connessione al server è stata interrotta.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="586"/>
@@ -4193,12 +4196,12 @@ La tua versione è la %1, la versione online è la %2.</translation>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
+        <translation>Controlla aggiornamenti carte in background</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
-        <translation type="unfinished"/>
+        <translation>Mostra barra di stato</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="699"/>
@@ -4326,7 +4329,7 @@ Scopri metodi alternativi per visualizzare i set o disabilitare set ed effetti n
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
-        <translation type="unfinished"/>
+        <translation>Aggiornamento delle carte in corso.</translation>
     </message>
     <message>
         <location filename="src/client/ui/window_main.cpp" line="1286"/>
@@ -4436,7 +4439,7 @@ Il database delle carte verrà ricaricato.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
-        <translation type="unfinished"/>
+        <translation>Base di mana</translation>
     </message>
 </context>
 <context>
@@ -4445,7 +4448,7 @@ Il database delle carte verrà ricaricato.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
-        <translation type="unfinished"/>
+        <translation>Curva di mana</translation>
     </message>
 </context>
 <context>
@@ -4454,7 +4457,7 @@ Il database delle carte verrà ricaricato.</translation>
         <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
         <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
-        <translation type="unfinished"/>
+        <translation>Simboli di mana</translation>
     </message>
 </context>
 <context>
@@ -4542,7 +4545,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>dalla zona personalizzata &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="117"/>
@@ -4632,7 +4635,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="223"/>
         <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
+        <translation>%1 crea una pedina a faccia in giù.</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="225"/>
@@ -4722,7 +4725,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="329"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>%1 mette %2 nella zona personalizzata &apos;%4&apos;%3.</translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="348"/>
@@ -4941,12 +4944,12 @@ Il database delle carte verrà ricaricato.</translation>
     <message numerus="yes">
         <location filename="src/server/message_log_widget.cpp" line="618"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 mette %2 segnalino &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 mette %2 segnalini &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 mette %2 segnalino(i) &quot;%3&quot; su %4 (totale %5).</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="src/server/message_log_widget.cpp" line="620"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 toglie %2 segnalino &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 toglie %2 segnalini &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 toglie %2 segnalino(i) &quot;%3&quot; su %4 (totale %5).</numerusform></translation>
     </message>
     <message>
         <location filename="src/server/message_log_widget.cpp" line="638"/>
@@ -5200,7 +5203,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
-        <translation>Layout</translation>
+        <translation>Disposizione</translation>
     </message>
     <message>
         <location filename="src/game/game_specific_terms.h" line="47"/>
@@ -5591,13 +5594,13 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="840"/>
         <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Zone personalizzate</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="843"/>
         <location filename="src/game/player/player.cpp" line="2806"/>
         <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Visualizza la zona personalizzata &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="846"/>
@@ -5627,7 +5630,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/game/player/player.cpp" line="852"/>
         <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
+        <translation>Segnalini delle ca&amp;rte</translation>
     </message>
     <message>
         <location filename="src/game/player/player.cpp" line="860"/>
@@ -6069,7 +6072,7 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
-        <translation type="unfinished"/>
+        <translation>Selezione massiva</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
@@ -6179,12 +6182,12 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
+        <translation>Sovrascrivere il file esistente?</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
+        <translation>Una versione .cod di questo mazzo esiste già. Sovrascriverla?</translation>
     </message>
 </context>
 <context>
@@ -6814,7 +6817,7 @@ Controlla le impostazioni!</translation>
     <message>
         <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
-        <translation>Resetta disposizione</translation>
+        <translation>Reimposta disposizione</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
@@ -6827,45 +6830,45 @@ Controlla le impostazioni!</translation>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <source>Visual Deck: %1</source>
-        <translation type="unfinished"/>
+        <translation>Mazzo visuale: %1</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <source>&amp;Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor &amp;visuale</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <source>Card Info</source>
-        <translation type="unfinished"/>
+        <translation>Info carta</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <source>Deck</source>
-        <translation type="unfinished"/>
+        <translation>Mazzo</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <source>Filters</source>
-        <translation type="unfinished"/>
+        <translation>Filtri</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Visualizza</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
         <source>Deck Analytics</source>
-        <translation type="unfinished"/>
+        <translation>Analisi mazzo</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <source>Printing</source>
-        <translation type="unfinished"/>
+        <translation>Stampa</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
@@ -6874,7 +6877,7 @@ Controlla le impostazioni!</translation>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <source>Visible</source>
-        <translation type="unfinished"/>
+        <translation>Mostra</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
@@ -6883,12 +6886,12 @@ Controlla le impostazioni!</translation>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <source>Floating</source>
-        <translation type="unfinished"/>
+        <translation>Separata</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
-        <translation type="unfinished"/>
+        <translation>Reimposta disposizione</translation>
     </message>
 </context>
 <context>
@@ -6896,22 +6899,22 @@ Controlla le impostazioni!</translation>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
-        <translation type="unfinished"/>
+        <translation>Galleria mazzo</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Galleria database</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
-        <translation type="unfinished"/>
+        <translation>Analisi mazzo</translation>
     </message>
     <message>
         <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
-        <translation type="unfinished"/>
+        <translation>Mano di esempio</translation>
     </message>
 </context>
 <context>
@@ -7084,32 +7087,32 @@ Please enter a name:</source>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Carte</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
-        <translation type="unfinished"/>
+        <translation>Comandanti più popolari</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Etichette</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation type="unfinished"/>
+        <translation>Cerca carta...</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation type="unfinished"/>
+        <translation>Cerca</translation>
     </message>
     <message>
         <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
         <source>EDHREC: </source>
-        <translation type="unfinished"/>
+        <translation>EDHREC: </translation>
     </message>
 </context>
 <context>
@@ -7255,7 +7258,7 @@ Please enter a name:</source>
     <message>
         <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
-        <translation>Resetta disposizione</translation>
+        <translation>Reimposta disposizione</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_game.cpp" line="486"/>
@@ -7725,12 +7728,12 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor visuale</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>EDHRec</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
@@ -7740,7 +7743,7 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Galleria database</translation>
     </message>
     <message>
         <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
@@ -7853,7 +7856,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Galleria database</translation>
     </message>
 </context>
 <context>
@@ -8327,7 +8330,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="878"/>
         <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
+        <translation>Passa alla barra di ricerca quando si apre la finestra di visualizzazione carta</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="879"/>
@@ -8387,42 +8390,42 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Mostra animazione al passaggio del mouse nella galleria mazzi </translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
+        <translation>Quando aggiungi un&apos;etichetta ad un mazzo in formato .txt nella Galleria mazzi:</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
-        <translation type="unfinished"/>
+        <translation>non fare nulla</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
+        <translation>chiedi se convertire in file .cod</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
-        <translation type="unfinished"/>
+        <translation>converti sempre in file .cod</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <source>Default deck editor type</source>
-        <translation type="unfinished"/>
+        <translation>Editor dei mazzi predefinito</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor classico</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor visuale</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
@@ -8463,22 +8466,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Include</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
         <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Include/Esclude</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
 </context>
 <context>
@@ -8486,17 +8489,17 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
-        <translation type="unfinished"/>
+        <translation>Salva filtro</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
+        <translation>Salva su file i filtri correnti</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
-        <translation type="unfinished"/>
+        <translation>Inserisci il nome del file...</translation>
     </message>
 </context>
 <context>
@@ -8504,22 +8507,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
+        <translation>Non mostrare i tipi di carta che hanno meno occorrenze nel database di questo numero</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Include</translation>
     </message>
 </context>
 <context>
@@ -8527,27 +8530,27 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
         <source>Filter by name...</source>
-        <translation type="unfinished"/>
+        <translation>Filtra per nome...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
-        <translation type="unfinished"/>
+        <translation>Carica da mazzo</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
+        <translation>Usa i nomi delle carte nel mazzo caricato come insieme di filtri a corrispondenza esatta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Carica dagli appunti</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
+        <translation>Usa i nomi delle carte negli appunti come insieme di filtri a corrispondenza esatta</translation>
     </message>
 </context>
 <context>
@@ -8555,7 +8558,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
-        <translation type="unfinished"/>
+        <translation>Filtra per i set più recenti</translation>
     </message>
 </context>
 <context>
@@ -8563,19 +8566,19 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <source>Search sets...</source>
-        <translation type="unfinished"/>
+        <translation>Ricerca set...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Include</translation>
     </message>
 </context>
 <context>
@@ -8583,27 +8586,27 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <source>Search subtypes...</source>
-        <translation type="unfinished"/>
+        <translation>Ricerca sottotipi...</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
+        <translation>Non mostrare i sottotipi che hanno meno occorrenze nel database di questo numero</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Modalità: Include</translation>
     </message>
 </context>
 <context>
@@ -8611,32 +8614,32 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
+        <translation>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <source>Clear all filters</source>
-        <translation type="unfinished"/>
+        <translation>Elimina tutti i filtri</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
         <source>Save and load filters</source>
-        <translation type="unfinished"/>
+        <translation>Salva e carica filtri</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
         <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
+        <translation>Filtra per nome della carta esatto</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
         <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
+        <translation>Filtra per sottotipo</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
         <source>Filter by set</source>
-        <translation type="unfinished"/>
+        <translation>Filtra per set</translation>
     </message>
 </context>
 <context>
@@ -8644,12 +8647,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
+        <translation>Pesca una nuova mano</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
-        <translation type="unfinished"/>
+        <translation>Dimensione della mano</translation>
     </message>
 </context>
 <context>
@@ -8657,38 +8660,38 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
         <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
+        <translation>Clicca e trascina per modificare i criteri di ordinamento all&apos;interno dei gruppi</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <source>Quick search and add card</source>
-        <translation type="unfinished"/>
+        <translation>Cerca e aggiungi carta al mazzo</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
+        <translation>Cerca per la corrispondenza più prossima nel database (con auto-completamento) e premendo Invio, aggiungi la stampa preferita della carta al mazzo.</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
         <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
+        <translation>Configura l&apos;ordinamento delle carte all&apos;interno dei gruppi</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
         <source>Overlap Layout</source>
-        <translation type="unfinished"/>
+        <translation>Disposizione sovrapposta</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
         <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
+        <translation>Imposta come le carte vengono mostrate all&apos;interno delle relative sezioni (sovrapposte o affiancate)</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
         <source>Flat Layout</source>
-        <translation type="unfinished"/>
+        <translation>Disposizione affiancata</translation>
     </message>
 </context>
 <context>
@@ -8704,47 +8707,47 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <source>Show Folders</source>
-        <translation type="unfinished"/>
+        <translation>Mostra cartelle</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <source>Show Tag Filter</source>
-        <translation type="unfinished"/>
+        <translation>Mostra filtro etichette</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <source>Show Tags On Deck Previews</source>
-        <translation type="unfinished"/>
+        <translation>Mostra etichette sulle anteprime dei mazzi</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <source>Show Banner Card Selection Option</source>
-        <translation type="unfinished"/>
+        <translation>Mostra opzione per selezione copertina</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <source>Draw unused Color Identities</source>
-        <translation type="unfinished"/>
+        <translation>Mostra identità di colore inutilizzate</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <source>Unused Color Identities Opacity</source>
-        <translation type="unfinished"/>
+        <translation>Opacità identità di colore inutilizzate</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <source>Deck tooltip:</source>
-        <translation type="unfinished"/>
+        <translation>Suggerimento mazzo:</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Nessuno</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
-        <translation type="unfinished"/>
+        <translation>Percorso file</translation>
     </message>
 </context>
 <context>
@@ -8752,7 +8755,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
-        <translation type="unfinished"/>
+        <translation>Cerca per nome del file (o espressioni di ricerca)</translation>
     </message>
 </context>
 <context>
@@ -8788,12 +8791,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
-        <translation type="unfinished"/>
+        <translation>Aggiorna i file caricati</translation>
     </message>
     <message>
         <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
-        <translation type="unfinished"/>
+        <translation>Impostazioni galleria mazzi</translation>
     </message>
 </context>
 <context>
@@ -8926,7 +8929,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/dialogs/dlg_manage_sets.cpp" line="163"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
+        <translation>Includi carte ribilanciate per Alchemy [richiede riavvio]</translation>
     </message>
     <message>
         <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
@@ -8979,7 +8982,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
         <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
+        <translation>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="219"/>
@@ -9313,7 +9316,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
         <location filename="src/settings/shortcuts_settings.h" line="242"/>
         <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
-        <translation>Reimposta Layout</translation>
+        <translation>Reimposta Disposizione</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="245"/>
@@ -9403,107 +9406,107 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
-        <translation type="unfinished"/>
+        <translation>Mostra barra di stato</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
-        <translation type="unfinished"/>
+        <translation>Deseleziona mazzo</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
-        <translation type="unfinished"/>
+        <translation>Forza avvio</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino (F)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (F)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (F)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino (E)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (E)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (E)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino(D)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (D)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (D)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino (C)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (C)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (C)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino (B)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (B)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (B)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi Segnalino (A)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Togli Segnalino (A)</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
+        <translation>Imposta Segnalini (A)...</translation>
     </message>
     <message>
         <location filename="src/settings/shortcuts_settings.h" line="347"/>
diff --git a/common/pb/context_deck_select.proto b/common/pb/context_deck_select.proto
index dbd4ce16e..44abd8583 100644
--- a/common/pb/context_deck_select.proto
+++ b/common/pb/context_deck_select.proto
@@ -7,4 +7,5 @@ message Context_DeckSelect {
     }
     optional string deck_hash = 1;
     optional int32 sideboard_size = 2 [default = -1];
+    optional string deck_list = 3;
 }
diff --git a/common/pb/room_commands.proto b/common/pb/room_commands.proto
index fce90e32e..5e8c158ff 100644
--- a/common/pb/room_commands.proto
+++ b/common/pb/room_commands.proto
@@ -39,6 +39,7 @@ message Command_CreateGame {
     optional bool join_as_judge = 11;
     optional bool join_as_spectator = 12;
     optional uint32 starting_life_total = 13;
+    optional bool share_decklists_on_load = 14;
 }
 
 message Command_JoinGame {
diff --git a/common/pb/serverinfo_game.proto b/common/pb/serverinfo_game.proto
index 8ba29eeeb..68739abff 100644
--- a/common/pb/serverinfo_game.proto
+++ b/common/pb/serverinfo_game.proto
@@ -16,6 +16,7 @@ message ServerInfo_Game {
     optional bool spectators_need_password = 12;
     optional bool spectators_can_chat = 13;
     optional bool spectators_omniscient = 14;
+    optional bool share_decklists_on_load = 15;
     optional uint32 player_count = 30;
     optional uint32 spectators_count = 31;
     optional bool started = 50;
diff --git a/common/server_game.cpp b/common/server_game.cpp
index f27772bbb..95d97f1da 100644
--- a/common/server_game.cpp
+++ b/common/server_game.cpp
@@ -21,6 +21,7 @@
 
 #include "decklist.h"
 #include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_deck_select.pb.h"
 #include "pb/context_ping_changed.pb.h"
 #include "pb/event_delete_arrow.pb.h"
 #include "pb/event_game_closed.pb.h"
@@ -62,15 +63,16 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
                          bool _spectatorsCanTalk,
                          bool _spectatorsSeeEverything,
                          int _startingLifeTotal,
+                         bool _shareDecklistsOnLoad,
                          Server_Room *_room)
     : QObject(), room(_room), nextPlayerId(0), hostId(0), creatorInfo(new ServerInfo_User(_creatorInfo)),
       gameStarted(false), gameClosed(false), gameId(_gameId), password(_password), maxPlayers(_maxPlayers),
       gameTypes(_gameTypes), activePlayer(-1), activePhase(-1), onlyBuddies(_onlyBuddies),
       onlyRegistered(_onlyRegistered), spectatorsAllowed(_spectatorsAllowed),
       spectatorsNeedPassword(_spectatorsNeedPassword), spectatorsCanTalk(_spectatorsCanTalk),
-      spectatorsSeeEverything(_spectatorsSeeEverything), startingLifeTotal(_startingLifeTotal), inactivityCounter(0),
-      startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false), turnOrderReversed(false),
-      startTime(QDateTime::currentDateTime()), pingClock(nullptr),
+      spectatorsSeeEverything(_spectatorsSeeEverything), startingLifeTotal(_startingLifeTotal),
+      shareDecklistsOnLoad(_shareDecklistsOnLoad), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0),
+      firstGameStarted(false), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
       gameMutex()
 #else
@@ -800,6 +802,7 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
         result.set_spectators_need_password(getSpectatorsNeedPassword());
         result.set_spectators_can_chat(spectatorsCanTalk);
         result.set_spectators_omniscient(spectatorsSeeEverything);
+        result.set_share_decklists_on_load(shareDecklistsOnLoad);
         result.set_spectators_count(getSpectatorCount());
         result.set_start_time(startTime.toSecsSinceEpoch());
     }
diff --git a/common/server_game.h b/common/server_game.h
index 2f8c005b6..226a14149 100644
--- a/common/server_game.h
+++ b/common/server_game.h
@@ -67,6 +67,7 @@ private:
     bool spectatorsCanTalk;
     bool spectatorsSeeEverything;
     int startingLifeTotal;
+    bool shareDecklistsOnLoad;
     int inactivityCounter;
     int startTimeOfThisGame, secondsElapsed;
     bool firstGameStarted;
@@ -106,7 +107,8 @@ public:
                 bool _spectatorsNeedPassword,
                 bool _spectatorsCanTalk,
                 bool _spectatorsSeeEverything,
-                int startingLifeTotal,
+                int _startingLifeTotal,
+                bool _shareDecklistsOnLoad,
                 Server_Room *parent);
     ~Server_Game() override;
     Server_Room *getRoom() const
@@ -168,6 +170,10 @@ public:
     {
         return startingLifeTotal;
     }
+    bool getShareDecklistsOnLoad() const
+    {
+        return shareDecklistsOnLoad;
+    }
     Response::ResponseCode
     checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions, bool asJudge);
     bool containsUser(const QString &userName) const;
diff --git a/common/server_player.cpp b/common/server_player.cpp
index 5f0667dee..67c5ef34c 100644
--- a/common/server_player.cpp
+++ b/common/server_player.cpp
@@ -836,6 +836,9 @@ Server_Player::cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &r
     Context_DeckSelect context;
     context.set_deck_hash(deck->getDeckHash().toStdString());
     context.set_sideboard_size(deck->getSideboardSize());
+    if (game->getShareDecklistsOnLoad()) {
+        context.set_deck_list(deck->writeToString_Native().toStdString());
+    }
     ges.setGameEventContext(context);
 
     auto *re = new Response_DeckDownload;
diff --git a/common/server_player.h b/common/server_player.h
index b9d414482..45736957d 100644
--- a/common/server_player.h
+++ b/common/server_player.h
@@ -96,6 +96,10 @@ public:
                   Server_AbstractUserInterface *_handler);
     ~Server_Player() override;
     void prepareDestroy();
+    const DeckList *getDeckList() const
+    {
+        return deck;
+    }
     Server_AbstractUserInterface *getUserInterface() const
     {
         return userInterface;
diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 075b3901e..d69ff9ba0 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -818,6 +818,8 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
     QString description = nameFromStdString(cmd.description());
     int startingLifeTotal = cmd.has_starting_life_total() ? cmd.starting_life_total() : 20;
 
+    bool shareDecklistsOnLoad = cmd.has_share_decklists_on_load() ? cmd.share_decklists_on_load() : false;
+
     const int gameId = databaseInterface->getNextGameId();
     if (gameId == -1) {
         return Response::RespInternalError;
@@ -828,7 +830,7 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
     Server_Game *game = new Server_Game(
         copyUserInfo(false), gameId, description, QString::fromStdString(cmd.password()), cmd.max_players(), gameTypes,
         cmd.only_buddies(), onlyRegisteredUsers, cmd.spectators_allowed(), cmd.spectators_need_password(),
-        cmd.spectators_can_talk(), cmd.spectators_see_everything(), startingLifeTotal, room);
+        cmd.spectators_can_talk(), cmd.spectators_see_everything(), startingLifeTotal, shareDecklistsOnLoad, room);
 
     game->addPlayer(this, rc, asSpectator, asJudge, false);
     room->addGame(game);
diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp
index 738a17695..ade0922e4 100644
--- a/dbconverter/src/mocks.cpp
+++ b/dbconverter/src/mocks.cpp
@@ -402,6 +402,9 @@ void SettingsCache::setCreateGameAsSpectator(const bool /* _createGameAsSpectato
 void SettingsCache::setDefaultStartingLifeTotal(const int /* _startingLifeTotal */)
 {
 }
+void SettingsCache::setShareDecklistsOnLoad(const bool /* _shareDecklistsOnLoad */)
+{
+}
 void SettingsCache::setRememberGameSettings(const bool /* _rememberGameSettings */)
 {
 }
diff --git a/oracle/translations/oracle_fr.ts b/oracle/translations/oracle_fr.ts
index 24362f733..b2beca4a4 100644
--- a/oracle/translations/oracle_fr.ts
+++ b/oracle/translations/oracle_fr.ts
@@ -63,7 +63,7 @@
         <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
-        <translation type="unfinished"/>
+        <translation>Choisir le fichier (%1)</translation>
     </message>
     <message>
         <location filename="src/oraclewizard.cpp" line="346"/>
@@ -144,7 +144,7 @@
     <message>
         <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
-        <translation type="unfinished"/>
+        <translation>Échec lors de l&apos;interprétation des données téléchargées.</translation>
     </message>
     <message>
         <location filename="src/oraclewizard.cpp" line="582"/>
@@ -303,7 +303,7 @@
     <message>
         <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
-        <translation type="unfinished"/>
+        <translation>Un fichier de base de données Cockatrice de %1 MB a été téléchargé.</translation>
     </message>
     <message>
         <location filename="src/oraclewizard.cpp" line="661"/>
@@ -368,7 +368,7 @@
     <message>
         <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
-        <translation type="unfinished"/>
+        <translation>L&apos;URL fournie n&apos;est pas valide :</translation>
     </message>
     <message>
         <location filename="src/pagetemplates.cpp" line="77"/>
@@ -401,12 +401,12 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;initialiser ou de charger la bibliothèque zlib.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur avec la bibliothèque zlib.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
@@ -416,7 +416,7 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation type="unfinished"/>
+        <translation>Archive partiellement corrompue. Certains fichiers ont pu être extraits.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
@@ -431,47 +431,47 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation type="unfinished"/>
+        <translation>Aucune archive n&apos;a été créée pour l&apos;instant.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation type="unfinished"/>
+        <translation>Le fichier ou le dossier n&apos;existe pas.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de la lecture du fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de l&apos;écriture du fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de la recherche dans le fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation type="unfinished"/>
+        <translation>Impossible de créer un répertoire.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation type="unfinished"/>
+        <translation>Périphérique non valide.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation type="unfinished"/>
+        <translation>Archive zip non valide ou incompatible.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation type="unfinished"/>
+        <translation>En-têtes inconsistants. L&apos;archive peut être corrompue.</translation>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
@@ -484,17 +484,17 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation type="unfinished"/>
+        <translation>Opération ZIP complétée avec succès.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;initialiser ou de charger la bibliothèque zlib.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur avec la bibliothèque zlib.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
@@ -504,32 +504,32 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation type="unfinished"/>
+        <translation>Aucune archive n&apos;a été créée pour l&apos;instant.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation type="unfinished"/>
+        <translation>Le fichier ou le dossier n&apos;existe pas.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de la lecture du fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de l&apos;écriture du fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur lors de la recherche dans le fichier.</translation>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur inconnue.</translation>
     </message>
 </context>
 <context>
@@ -550,7 +550,7 @@
     <message>
         <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
-        <translation type="unfinished"/>
+        <translation>S&apos;exécuter en mode tâche de fond sans demande de confirmation</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/oracle/translations/oracle_it.ts b/oracle/translations/oracle_it.ts
index 8688f03e3..192e8cc0e 100644
--- a/oracle/translations/oracle_it.ts
+++ b/oracle/translations/oracle_it.ts
@@ -369,7 +369,7 @@ e pedine che verranno usate da Cockatrice.</translation>
     <message>
         <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
-        <translation type="unfinished"/>
+        <translation>L&apos;indirizzo fornito non è valido:</translation>
     </message>
     <message>
         <location filename="src/pagetemplates.cpp" line="77"/>
@@ -551,7 +551,7 @@ e pedine che verranno usate da Cockatrice.</translation>
     <message>
         <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
-        <translation type="unfinished"/>
+        <translation>Esegui in background senza conferma</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp
index 9d158217e..4c3a81322 100644
--- a/tests/carddatabase/mocks.cpp
+++ b/tests/carddatabase/mocks.cpp
@@ -406,6 +406,9 @@ void SettingsCache::setCreateGameAsSpectator(const bool /* _createGameAsSpectato
 void SettingsCache::setDefaultStartingLifeTotal(const int /* _startingLifeTotal */)
 {
 }
+void SettingsCache::setShareDecklistsOnLoad(const bool /* _shareDecklistsOnLoad */)
+{
+}
 void SettingsCache::setRememberGameSettings(const bool /* _rememberGameSettings */)
 {
 }